From dfd1e8ce18a3a1417765ce42157072be4a92878d Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Thu, 4 Feb 2021 18:34:55 +0800 Subject: [PATCH 1/8] revert --- Jenkinsfile | 46 ++++++++++++++-------------------------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bd56309dd2..536cbe73a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,7 +31,6 @@ def abort_previous(){ if (buildNumber > 1) milestone(buildNumber - 1) milestone(buildNumber) } -def kipstage=0 def pre_test(){ catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { sh ''' @@ -73,29 +72,12 @@ pipeline { } stages { - stage('pre_build'){ - agent{label 'master'} - steps { - sh''' - cd ${WORKSPACE} - git checkout develop - git pull - git fetch origin +refs/pull/${CHANGE_ID}/merge - git checkout -qf FETCH_HEAD - ''' - script{ - skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) - } - } - } + stage('Parallel test stage') { //only build pr when { changeRequest() - expression { - skipstage == 0 - } } parallel { stage('python_1_s1') { @@ -145,7 +127,7 @@ pipeline { stage('test_b1_s2') { agent{label 'b1'} steps { - timeout(time: 45, unit: 'MINUTES'){ + timeout(time: 90, unit: 'MINUTES'){ pre_test() sh ''' cd ${WKC}/tests @@ -262,8 +244,8 @@ pipeline { success { emailext ( - subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS", - body: """ + subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'", + body: ''' @@ -279,29 +261,29 @@ pipeline { - """, + ''', to: "${env.CHANGE_AUTHOR_EMAIL}", from: "support@taosdata.com" ) } failure { emailext ( - subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' FAIL", - body: """ + subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'", + body: ''' @@ -317,21 +299,21 @@ pipeline { - """, + ''', to: "${env.CHANGE_AUTHOR_EMAIL}", from: "support@taosdata.com" ) From 2207ca006b5c9cbdf3bb31dd8ea6503a244873b9 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 11:07:37 +0800 Subject: [PATCH 2/8] cancel build excluded regions stategy --- Jenkinsfile | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 536cbe73a2..59dcb35bac 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -63,6 +63,7 @@ def pre_test(){ ''' return 1 } +def kipstage=0 pipeline { agent none @@ -75,9 +76,27 @@ pipeline { stage('Parallel test stage') { + stage('pre_build'){ + agent{label 'master'} + steps { + sh''' + cd ${WORKSPACE} + git checkout develop + git pull + git fetch origin +refs/pull/${CHANGE_ID}/merge + git checkout -qf FETCH_HEAD + ''' + script{ + skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) + } + } + } //only build pr when { changeRequest() + expression { + skipstage == 0 + } } parallel { stage('python_1_s1') { @@ -127,7 +146,7 @@ pipeline { stage('test_b1_s2') { agent{label 'b1'} steps { - timeout(time: 90, unit: 'MINUTES'){ + timeout(time: 45, unit: 'MINUTES'){ pre_test() sh ''' cd ${WKC}/tests @@ -244,8 +263,8 @@ pipeline { success { emailext ( - subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'", - body: ''' + subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS", + body: """ @@ -261,29 +280,29 @@ pipeline { - ''', + """, to: "${env.CHANGE_AUTHOR_EMAIL}", from: "support@taosdata.com" ) } failure { emailext ( - subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]'", - body: ''' + subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' FAIL", + body: """ @@ -299,21 +318,21 @@ pipeline { - ''', + """, to: "${env.CHANGE_AUTHOR_EMAIL}", from: "support@taosdata.com" ) From aee811d65bf34ceb2cf40f8ad00eaf4ceb97c36d Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 11:28:24 +0800 Subject: [PATCH 3/8] change --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 59dcb35bac..4165f297ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -260,7 +260,6 @@ pipeline { } } post { - success { emailext ( subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS", From e61df9d8a0179f3e48340599e544a3c42ea8338f Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 11:32:50 +0800 Subject: [PATCH 4/8] cancel build excluded regions stategy --- Jenkinsfile | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9dab0d66be..4165f297ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -76,9 +76,27 @@ pipeline { stage('Parallel test stage') { + stage('pre_build'){ + agent{label 'master'} + steps { + sh''' + cd ${WORKSPACE} + git checkout develop + git pull + git fetch origin +refs/pull/${CHANGE_ID}/merge + git checkout -qf FETCH_HEAD + ''' + script{ + skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) + } + } + } //only build pr when { changeRequest() + expression { + skipstage == 0 + } } parallel { stage('python_1_s1') { @@ -128,7 +146,7 @@ pipeline { stage('test_b1_s2') { agent{label 'b1'} steps { - timeout(time: 90, unit: 'MINUTES'){ + timeout(time: 45, unit: 'MINUTES'){ pre_test() sh ''' cd ${WKC}/tests @@ -265,7 +283,7 @@ pipeline {
  • 构建结果： Successful
  • 构建编号：${BUILD_NUMBER}
  • 触发用户：${env.CHANGE_AUTHOR}
    • -
  • 提交信息：${env.CHANGE_TITLE}
    • +
  • 提交信息：${CHANGE_TITLE}
  • 构建地址：${BUILD_URL}
  • 构建日志：${BUILD_URL}console
    • @@ -303,7 +321,7 @@ pipeline {
  • 构建结果： Successful
  • 构建编号：${BUILD_NUMBER}
  • 触发用户：${env.CHANGE_AUTHOR}
    • -
  • 提交信息：${env.CHANGE_TITLE}
    • +
  • 提交信息：${CHANGE_TITLE}
  • 构建地址：${BUILD_URL}
  • 构建日志：${BUILD_URL}console
    • From 1fc7765dff6fbdf80e683e8f852b7b05835ad90c Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 11:37:17 +0800 Subject: [PATCH 5/8] change --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4165f297ed..2947c398c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -73,10 +73,7 @@ pipeline { } stages { - - - stage('Parallel test stage') { - stage('pre_build'){ + stage('pre_build'){ agent{label 'master'} steps { sh''' @@ -91,6 +88,9 @@ pipeline { } } } + + stage('Parallel test stage') { + //only build pr when { changeRequest() From 70b9a07ea350d386527787b41581b13705f95e74 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 11:52:29 +0800 Subject: [PATCH 6/8] fix error --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2947c398c2..52784020f2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,13 +37,13 @@ def pre_test(){ sudo rmtaos ''' } - sh ''' + sh """ cd ${WKC} git checkout develop git reset --hard HEAD~10 >/dev/null git pull - git fetch origin +refs/pull/${CHANGE_ID}/merge + git fetch origin +refs/pull/${env.CHANGE_ID}/merge git checkout -qf FETCH_HEAD git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0 cd ${WK} @@ -60,7 +60,7 @@ def pre_test(){ make > /dev/null make install > /dev/null cd ${WKC}/tests - ''' + """ return 1 } def kipstage=0 @@ -76,13 +76,13 @@ pipeline { stage('pre_build'){ agent{label 'master'} steps { - sh''' + sh""" cd ${WORKSPACE} git checkout develop git pull - git fetch origin +refs/pull/${CHANGE_ID}/merge + git fetch origin +refs/pull/${env.CHANGE_ID}/merge git checkout -qf FETCH_HEAD - ''' + """ script{ skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) } From b2953230c64806057dd49e2e369a5b9ea5c1ed96 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 13:56:34 +0800 Subject: [PATCH 7/8] fix error --- Jenkinsfile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 52784020f2..9d5a2928c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ node { git url: 'https://github.com/taosdata/TDengine.git' } - +def kipstage=0 def abortPreviousBuilds() { def currentJobName = env.JOB_NAME def currentBuildNumber = env.BUILD_NUMBER.toInteger() @@ -37,13 +37,13 @@ def pre_test(){ sudo rmtaos ''' } - sh """ + sh ''' cd ${WKC} git checkout develop git reset --hard HEAD~10 >/dev/null git pull - git fetch origin +refs/pull/${env.CHANGE_ID}/merge + git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD git --no-pager diff --name-only FETCH_HEAD $(git merge-base FETCH_HEAD develop)|grep -v -E '.*md|//src//connector|Jenkinsfile' || exit 0 cd ${WK} @@ -60,10 +60,10 @@ def pre_test(){ make > /dev/null make install > /dev/null cd ${WKC}/tests - """ + ''' return 1 } -def kipstage=0 + pipeline { agent none @@ -75,14 +75,17 @@ pipeline { stages { stage('pre_build'){ agent{label 'master'} + when { + changeRequest() + } steps { - sh""" + sh''' cd ${WORKSPACE} git checkout develop git pull - git fetch origin +refs/pull/${env.CHANGE_ID}/merge + git fetch origin +refs/pull/${CHANGE_ID}/merge git checkout -qf FETCH_HEAD - """ + ''' script{ skipstage=sh(script:"git --no-pager diff --name-only FETCH_HEAD develop|grep -v -E '.*md|//src//connector|Jenkinsfile|test-all.sh' || echo 1 ",returnStdout:true) } @@ -259,7 +262,7 @@ pipeline { } } } - post { + post { success { emailext ( subject: "PR-result: Job '${env.JOB_NAME} [${env.BUILD_NUMBER}]' SUCCESS", @@ -318,7 +321,7 @@ pipeline {
    • 构建名称>>分支：${env.BRANCH_NAME}
      • -
    • 构建结果： Successful
      • +
    • 构建结果： Failure
    • 构建编号：${BUILD_NUMBER}
    • 触发用户：${env.CHANGE_AUTHOR}
    • 提交信息：${CHANGE_TITLE}
      • From 5a8382da3588e975a39d2223b467d9e77a9a4f53 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Fri, 5 Feb 2021 14:12:04 +0800 Subject: [PATCH 8/8] fix --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9d5a2928c2..7028308b34 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -286,7 +286,7 @@ pipeline {
    • 构建结果： Successful
    • 构建编号：${BUILD_NUMBER}
    • 触发用户：${env.CHANGE_AUTHOR}
      • -
    • 提交信息：${CHANGE_TITLE}
      • +
    • 提交信息：${env.CHANGE_TITLE}
    • 构建地址：${BUILD_URL}
    • 构建日志：${BUILD_URL}console
      • @@ -324,7 +324,7 @@ pipeline {
    • 构建结果： Failure
    • 构建编号：${BUILD_NUMBER}
    • 触发用户：${env.CHANGE_AUTHOR}
      • -
    • 提交信息：${CHANGE_TITLE}
      • +
    • 提交信息：${env.CHANGE_TITLE}
    • 构建地址：${BUILD_URL}
    • 构建日志：${BUILD_URL}console