From b6e3d4e3514fd3010bc2ed5f7e30cd14d10995b6 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 10:21:44 +0800 Subject: [PATCH 1/8] test abort last job --- Jenkinsfile | 73 +++++++++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 27 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 68fe4879c1..31219d4c1b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,37 +6,56 @@ node { } def skipstage=0 -def abortPreviousBuilds() { - def currentJobName = env.JOB_NAME - def currentBuildNumber = env.BUILD_NUMBER.toInteger() - def jobs = Jenkins.instance.getItemByFullName(currentJobName) - def builds = jobs.getBuilds() +def cancelPreviousBuilds() { + def jobName = env.JOB_NAME + def buildNumber = env.BUILD_NUMBER.toInteger() + /* Get job name */ + def currentJob = Jenkins.instance.getItemByFullName(jobName) - for (build in builds) { - if (!build.isBuilding()) { - continue; + /* Iterating over the builds for specific job */ + for (def build : currentJob.builds) { + def exec = build.getExecutor() + /* If there is a build that is currently running and it's not current build */ + if (build.isBuilding() && build.number.toInteger() != buildNumber && exec != null) { + /* Then stop it */ + exec.interrupt( + Result.ABORTED, + new CauseOfInterruption.UserInterruption("Aborted by #${currentBuild.number}") + ) + println("Aborted previously running build #${build.number}") + } } - - if (currentBuildNumber == build.getNumber().toInteger()) { - continue; - } - - build.doKill() //doTerm(),doKill(),doTerm() - } -} -//abort previous build -abortPreviousBuilds() -def abort_previous(){ - def buildNumber = env.BUILD_NUMBER as int - if (buildNumber > 1) milestone(buildNumber - 1) - milestone(buildNumber) } +// def abortPreviousBuilds() { +// def currentJobName = env.JOB_NAME +// def currentBuildNumber = env.BUILD_NUMBER.toInteger() +// def jobs = Jenkins.instance.getItemByFullName(currentJobName) +// def builds = jobs.getBuilds() + +// for (build in builds) { +// if (!build.isBuilding()) { +// continue; +// } + +// if (currentBuildNumber == build.getNumber().toInteger()) { +// continue; +// } + +// build.doKill() //doTerm(),doKill(),doTerm() +// } +// } +// //abort previous build +// abortPreviousBuilds() +// def abort_previous(){ +// def buildNumber = env.BUILD_NUMBER as int +// if (buildNumber > 1) milestone(buildNumber - 1) +// milestone(buildNumber) +// } def pre_test(){ - catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') { - sh ''' - sudo rmtaos - ''' - } + + sh ''' + sudo rmtaos || echo "taosd has not installed" + ''' sh ''' cd ${WKC} From 6c850c0894f7e81b6d2847151d54f4547dd14ff3 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 10:31:10 +0800 Subject: [PATCH 2/8] test --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 31219d4c1b..ff9327f603 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -44,7 +44,7 @@ def cancelPreviousBuilds() { // build.doKill() //doTerm(),doKill(),doTerm() // } // } -// //abort previous build + //abort previous build // abortPreviousBuilds() // def abort_previous(){ // def buildNumber = env.BUILD_NUMBER as int From ec4e27e46dbf9377099ff066bf8dcf64d977c289 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 10:49:55 +0800 Subject: [PATCH 3/8] fix --- tests/test-all.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test-all.sh b/tests/test-all.sh index bda03191d1..ba4b0e6fbf 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -93,6 +93,7 @@ function runSimCaseOneByOnefq { else cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" ` fi + dohavecore 1 exit 8 fi end_time=`date +%s` @@ -151,6 +152,7 @@ function runPyCaseOneByOnefq { out_log=`tail -1 pytest-out.log ` if [[ $out_log =~ 'failed' ]];then cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" ` + dohavecore 1 exit 8 fi echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log From da78c3af789c49918d14a3c14c13cbf6aac46408 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 12:27:54 +0800 Subject: [PATCH 4/8] recover --- Jenkinsfile | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ff9327f603..71214d1495 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,51 +6,51 @@ node { } def skipstage=0 -def cancelPreviousBuilds() { - def jobName = env.JOB_NAME - def buildNumber = env.BUILD_NUMBER.toInteger() - /* Get job name */ - def currentJob = Jenkins.instance.getItemByFullName(jobName) +// def cancelPreviousBuilds() { +// def jobName = env.JOB_NAME +// def buildNumber = env.BUILD_NUMBER.toInteger() +// /* Get job name */ +// def currentJob = Jenkins.instance.getItemByFullName(jobName) - /* Iterating over the builds for specific job */ - for (def build : currentJob.builds) { - def exec = build.getExecutor() - /* If there is a build that is currently running and it's not current build */ - if (build.isBuilding() && build.number.toInteger() != buildNumber && exec != null) { - /* Then stop it */ - exec.interrupt( - Result.ABORTED, - new CauseOfInterruption.UserInterruption("Aborted by #${currentBuild.number}") - ) - println("Aborted previously running build #${build.number}") - } +// /* Iterating over the builds for specific job */ +// for (def build : currentJob.builds) { +// def exec = build.getExecutor() +// /* If there is a build that is currently running and it's not current build */ +// if (build.isBuilding() && build.number.toInteger() != buildNumber && exec != null) { +// /* Then stop it */ +// exec.interrupt( +// Result.ABORTED, +// new CauseOfInterruption.UserInterruption("Aborted by #${currentBuild.number}") +// ) +// println("Aborted previously running build #${build.number}") +// } +// } +// } +def abortPreviousBuilds() { + def currentJobName = env.JOB_NAME + def currentBuildNumber = env.BUILD_NUMBER.toInteger() + def jobs = Jenkins.instance.getItemByFullName(currentJobName) + def builds = jobs.getBuilds() + + for (build in builds) { + if (!build.isBuilding()) { + continue; } + + if (currentBuildNumber == build.getNumber().toInteger()) { + continue; + } + + build.doKill() //doTerm(),doKill(),doTerm() + } +} +// abort previous build +abortPreviousBuilds() +def abort_previous(){ + def buildNumber = env.BUILD_NUMBER as int + if (buildNumber > 1) milestone(buildNumber - 1) + milestone(buildNumber) } -// def abortPreviousBuilds() { -// def currentJobName = env.JOB_NAME -// def currentBuildNumber = env.BUILD_NUMBER.toInteger() -// def jobs = Jenkins.instance.getItemByFullName(currentJobName) -// def builds = jobs.getBuilds() - -// for (build in builds) { -// if (!build.isBuilding()) { -// continue; -// } - -// if (currentBuildNumber == build.getNumber().toInteger()) { -// continue; -// } - -// build.doKill() //doTerm(),doKill(),doTerm() -// } -// } - //abort previous build -// abortPreviousBuilds() -// def abort_previous(){ -// def buildNumber = env.BUILD_NUMBER as int -// if (buildNumber > 1) milestone(buildNumber - 1) -// milestone(buildNumber) -// } def pre_test(){ sh ''' From 6555dcf4776f41bf30bc7e8a30d19f5aa8d62677 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 12:55:34 +0800 Subject: [PATCH 5/8] [TD-3432]fix jenkins --- Jenkinsfile | 22 ++-------------------- tests/test-all.sh | 2 +- 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 71214d1495..c8fd2083f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,26 +6,7 @@ node { } def skipstage=0 -// def cancelPreviousBuilds() { -// def jobName = env.JOB_NAME -// def buildNumber = env.BUILD_NUMBER.toInteger() -// /* Get job name */ -// def currentJob = Jenkins.instance.getItemByFullName(jobName) -// /* Iterating over the builds for specific job */ -// for (def build : currentJob.builds) { -// def exec = build.getExecutor() -// /* If there is a build that is currently running and it's not current build */ -// if (build.isBuilding() && build.number.toInteger() != buildNumber && exec != null) { -// /* Then stop it */ -// exec.interrupt( -// Result.ABORTED, -// new CauseOfInterruption.UserInterruption("Aborted by #${currentBuild.number}") -// ) -// println("Aborted previously running build #${build.number}") -// } -// } -// } def abortPreviousBuilds() { def currentJobName = env.JOB_NAME def currentBuildNumber = env.BUILD_NUMBER.toInteger() @@ -52,7 +33,8 @@ def abort_previous(){ milestone(buildNumber) } def pre_test(){ - + abort_previous() + abortPreviousBuilds() sh ''' sudo rmtaos || echo "taosd has not installed" ''' diff --git a/tests/test-all.sh b/tests/test-all.sh index 8e03c75f9a..c44737a8e8 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -100,7 +100,7 @@ function runSimCaseOneByOnefq { cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" ` rm -rf ../../sim/case.log fi - dohavecore 1 + dohavecore $2 exit 8 fi end_time=`date +%s` From 48c1dcb4ca540327a4079c02c6554e670c76de59 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 12:59:41 +0800 Subject: [PATCH 6/8] change --- Jenkinsfile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8fd2083f6..bac48115d3 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,8 +33,11 @@ def abort_previous(){ milestone(buildNumber) } def pre_test(){ - abort_previous() - abortPreviousBuilds() + script{ + abort_previous() + abortPreviousBuilds() + } + sh ''' sudo rmtaos || echo "taosd has not installed" ''' @@ -81,6 +84,10 @@ pipeline { changeRequest() } steps { + script{ + abort_previous() + abortPreviousBuilds() + } sh''' cp -r ${WORKSPACE} ${WORKSPACE}.tes cd ${WORKSPACE}.tes From 5e8ab6b948fcfe17a6ba27338e1e3ea955b3e986 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 13:04:42 +0800 Subject: [PATCH 7/8] fix --- tests/test-all.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/test-all.sh b/tests/test-all.sh index c44737a8e8..2268037d58 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -101,7 +101,9 @@ function runSimCaseOneByOnefq { rm -rf ../../sim/case.log fi dohavecore $2 - exit 8 + if [[ $2 == 1 ]];then + exit 8 + fi fi end_time=`date +%s` echo execution time of $case was `expr $end_time - $start_time`s. | tee -a out.log @@ -174,7 +176,9 @@ function runPyCaseOneByOnefq() { cat ../../sim/case.log rm -rf ../../sim/case.log dohavecore $2 - exit 8 + if [[ $2 == 1 ]];then + exit 8 + fi fi echo execution time of $case was `expr $end_time - $start_time`s. | tee -a pytest-out.log else From a9eecfa5c1db9b857612366f965361428bf2ca00 Mon Sep 17 00:00:00 2001 From: liuyq-617 Date: Tue, 23 Mar 2021 15:59:41 +0800 Subject: [PATCH 8/8] fix --- Jenkinsfile | 5 +---- tests/test-all.sh | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bac48115d3..e1bb27bf67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,10 +33,7 @@ def abort_previous(){ milestone(buildNumber) } def pre_test(){ - script{ - abort_previous() - abortPreviousBuilds() - } + sh ''' sudo rmtaos || echo "taosd has not installed" diff --git a/tests/test-all.sh b/tests/test-all.sh index 2268037d58..b8f06d8ede 100755 --- a/tests/test-all.sh +++ b/tests/test-all.sh @@ -172,7 +172,7 @@ function runPyCaseOneByOnefq() { out_log=`tail -1 pytest-out.log ` if [[ $out_log =~ 'failed' ]];then cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" ` - echo '=====================log=====================' + echo '=====================log===================== ' cat ../../sim/case.log rm -rf ../../sim/case.log dohavecore $2