xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch '3.0' into 3.0_refact

This commit is contained in:
Hongze Cheng 2021-09-26 13:17:36 +08:00
parent 3347de549f b04ab19be4
commit dfa65623f4
1 changed files with 36 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
Jenkinsfile vendored
View File

@ -41,84 +41,80 @@ def pre_test(){
killall -9 taosd ||echo "no taosd running" killall -9 taosd ||echo "no taosd running"
killall -9 gdb || echo "no gdb running" killall -9 gdb || echo "no gdb running"
killall -9 python3.8 || echo "no python program running" killall -9 python3.8 || echo "no python program running"
cd ${WKC} cd ${WORKSPACE}
git reset --hard HEAD~10 >/dev/null git reset --hard HEAD~10 >/dev/null
''' '''
script { script {
if (env.CHANGE_TARGET == 'master') { if (env.CHANGE_TARGET == 'master') {
sh ''' sh '''
cd ${WKC} cd ${WORKSPACE}
git checkout master git checkout master
''' '''
} }
else if(env.CHANGE_TARGET == '2.0'){ else if(env.CHANGE_TARGET == '2.0'){
sh ''' sh '''
cd ${WKC} cd ${WORKSPACE}
git checkout 2.0 git checkout 2.0
''' '''
} }
else if(env.CHANGE_TARGET == '3.0'){ else if(env.CHANGE_TARGET == '3.0'){
sh ''' sh '''
cd ${WKC} cd ${WORKSPACE}
git checkout 3.0 git checkout 3.0
''' '''
} }
else{ else{
sh ''' sh '''
cd ${WKC} cd ${WORKSPACE}
git checkout develop git checkout develop
''' '''
} }
} }
sh''' sh'''
cd ${WKC} cd ${WORKSPACE}
git pull >/dev/null git pull >/dev/null
git fetch origin +refs/pull/${CHANGE_ID}/merge git fetch origin +refs/pull/${CHANGE_ID}/merge
git checkout -qf FETCH_HEAD git checkout -qf FETCH_HEAD
git clean -dfx git clean -dfx
cd ${WK}
git reset --hard HEAD~10
''' '''
script { // script {
if (env.CHANGE_TARGET == 'master') { // if (env.CHANGE_TARGET == 'master') {
sh ''' // sh '''
cd ${WK} // cd ${WK}
git checkout master // git checkout master
''' // '''
} // }
else if(env.CHANGE_TARGET == '2.0'){ // else if(env.CHANGE_TARGET == '2.0'){
sh ''' // sh '''
cd ${WK} // cd ${WK}
git checkout 2.0 // git checkout 2.0
''' // '''
} // }
else if(env.CHANGE_TARGET == '3.0'){ // else if(env.CHANGE_TARGET == '3.0'){
sh ''' // sh '''
cd ${WK} // cd ${WK}
git checkout 3.0 // git checkout 3.0
''' // '''
} // }
else{ // else{
sh ''' // sh '''
cd ${WK} // cd ${WK}
git checkout develop // git checkout develop
''' // '''
} // }
} // }
// sh '''
// cd ${WK}
// git pull >/dev/null
sh ''' sh '''
cd ${WK}
git pull >/dev/null
export TZ=Asia/Harbin export TZ=Asia/Harbin
date date
git clean -dfx
mkdir debug mkdir debug
cd debug cd debug
cmake .. > /dev/null cmake .. > /dev/null
make > /dev/null make > /dev/null
make install > /dev/null make install > /dev/null
cd ${WKC}/tests
pip3 install ${WKC}/src/connector/python/
''' '''
return 1 return 1
} }