diff --git a/Jenkinsfile b/Jenkinsfile index 8689e19274fd87e85e386e4d597a762309d8fcb4..9fd44923c02875fa5f6483d37e10eaf1807cac12 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -46,6 +46,7 @@ def pre_test(){ killall -9 gdb || echo "no gdb running" killall -9 python3.8 || echo "no python program running" cd ${WKC} + [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md" git reset --hard HEAD~10 >/dev/null ''' script { @@ -77,6 +78,8 @@ def pre_test(){ git checkout -qf FETCH_HEAD git clean -dfx git submodule update --init --recursive + cd src/kit/taos-tools/deps/avro + git clean -dfx cd ${WK} git reset --hard HEAD~10 ''' @@ -121,6 +124,7 @@ def pre_test_noinstall(){ sh'hostname' sh''' cd ${WKC} + [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md" git reset --hard HEAD~10 >/dev/null ''' script { @@ -152,6 +156,8 @@ def pre_test_noinstall(){ git checkout -qf FETCH_HEAD git clean -dfx git submodule update --init --recursive + cd src/kit/taos-tools/deps/avro + git clean -dfx cd ${WK} git reset --hard HEAD~10 ''' @@ -184,7 +190,7 @@ def pre_test_noinstall(){ git clean -dfx mkdir debug cd debug - cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=false > /dev/null + cmake .. -DBUILD_HTTP=false -DBUILD_TOOLS=true > /dev/null make ''' return 1 @@ -193,6 +199,7 @@ def pre_test_mac(){ sh'hostname' sh''' cd ${WKC} + [ -f src/connector/grafanaplugin/README.md ] && rm -f src/connector/grafanaplugin/README.md > /dev/null || echo "failed to remove grafanaplugin README.md" git reset --hard HEAD~10 >/dev/null ''' script { @@ -224,6 +231,8 @@ def pre_test_mac(){ git checkout -qf FETCH_HEAD git clean -dfx git submodule update --init --recursive + cd src/kit/taos-tools/deps/avro + git clean -dfx cd ${WK} git reset --hard HEAD~10 ''' @@ -352,7 +361,7 @@ pipeline { } stages { stage('pre_build'){ - agent{label 'catalina'} + agent{label 'master'} options { skipDefaultCheckout() } when { changeRequest() @@ -361,37 +370,13 @@ pipeline { script{ abort_previous() abortPreviousBuilds() - println env.CHANGE_BRANCH - if(env.CHANGE_FORK){ - scope = ['connector','query','insert','other','tools','taosAdapter'] - } - else{ - sh''' - cd ${WKC} - git reset --hard HEAD~10 - git fetch - git checkout ${CHANGE_BRANCH} - git pull - ''' - dir('/var/lib/jenkins/workspace/TDinternal/community'){ - gitlog = sh(script: "git log -1 --pretty=%B ", returnStdout:true) - println gitlog - if (!(gitlog =~ /\((.*?)\)/)){ - autoCancelled = true - error('Please fill in the scope information correctly.\neg. [TD-xxxx](query,insert):xxxxxxxxxxxxxxxxxx ') - } - temp = (gitlog =~ /\((.*?)\)/) - temp = temp[0].remove(1) - scope = temp.split(",") - scope = ['connector','query','insert','other','tools','taosAdapter'] - Collections.shuffle mod - Collections.shuffle sim_mod - } + scope = ['connector','query','insert','other','tools','taosAdapter'] + Collections.shuffle mod + Collections.shuffle sim_mod + } - } - } } - } + } stage('Parallel test stage') { //only build pr options { skipDefaultCheckout() }