提交 6555dcf4 编写于 作者: L liuyq-617

[TD-3432]fix jenkins

上级 da78c3af
...@@ -6,26 +6,7 @@ node { ...@@ -6,26 +6,7 @@ node {
} }
def skipstage=0 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 abortPreviousBuilds() {
def currentJobName = env.JOB_NAME def currentJobName = env.JOB_NAME
def currentBuildNumber = env.BUILD_NUMBER.toInteger() def currentBuildNumber = env.BUILD_NUMBER.toInteger()
...@@ -52,7 +33,8 @@ def abort_previous(){ ...@@ -52,7 +33,8 @@ def abort_previous(){
milestone(buildNumber) milestone(buildNumber)
} }
def pre_test(){ def pre_test(){
abort_previous()
abortPreviousBuilds()
sh ''' sh '''
sudo rmtaos || echo "taosd has not installed" sudo rmtaos || echo "taosd has not installed"
''' '''
......
...@@ -100,7 +100,7 @@ function runSimCaseOneByOnefq { ...@@ -100,7 +100,7 @@ function runSimCaseOneByOnefq {
cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" ` cp -r ../../sim ~/sim_`date "+%Y_%m_%d_%H:%M:%S" `
rm -rf ../../sim/case.log rm -rf ../../sim/case.log
fi fi
dohavecore 1 dohavecore $2
exit 8 exit 8
fi fi
end_time=`date +%s` end_time=`date +%s`
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册