Fixed salt formulas old tests killing
Change-Id: Iee5c0417ecbe2d614eb1e6c78f63926486df52e1
diff --git a/test-salt-formulas-pipeline.groovy b/test-salt-formulas-pipeline.groovy
index 6d12ec6..61379ab 100644
--- a/test-salt-formulas-pipeline.groovy
+++ b/test-salt-formulas-pipeline.groovy
@@ -7,7 +7,6 @@
def common = new com.mirantis.mk.Common()
def gerrit = new com.mirantis.mk.Gerrit()
def ruby = new com.mirantis.mk.Ruby()
-def jenkinsUtils = new com.mirantis.mk.JenkinsUtils()
def gerritRef
try {
@@ -29,15 +28,15 @@
node("python&&docker") {
try{
- //stage("stop old tests"){
- // if (gerritRef) {
- // def runningTestBuildNums = _getRunningTriggeredTestsBuildNumbers(env["JOB_NAME"], GERRIT_CHANGE_NUMBER, GERRIT_PATCHSET_NUMBER)
- // for(int i=0; i<runningTestBuildNums.size(); i++){
- // common.infoMsg("Old test with run number ${runningTestBuildNums[i]} found, stopping")
- // Jenkins.instance.getItemByFullName(env["JOB_NAME"]).getBuildByNumber(runningTestBuildNums[i]).finish(hudson.model.Result.ABORTED, new java.io.IOException("Aborting build"));
- // }
- // }
- //}
+ stage("stop old tests"){
+ if (gerritRef) {
+ def runningTestBuildNums = _getRunningTriggeredTestsBuildNumbers(env["JOB_NAME"], GERRIT_CHANGE_NUMBER, GERRIT_PATCHSET_NUMBER)
+ for(int i=0; i<runningTestBuildNums.size(); i++){
+ common.infoMsg("Old test with run number ${runningTestBuildNums[i]} found, stopping")
+ Jenkins.instance.getItemByFullName(env["JOB_NAME"]).getBuildByNumber(runningTestBuildNums[i]).finish(hudson.model.Result.ABORTED, new java.io.IOException("Aborting build"));
+ }
+ }
+ }
stage("checkout") {
if (gerritRef) {
// job is triggered by Gerrit
@@ -86,6 +85,12 @@
@NonCPS
def _getRunningTriggeredTestsBuildNumbers(jobName, gerritChangeNumber, excludePatchsetNumber){
- return gerrit.getGerritTriggeredBuilds(jenkinsUtils.getJobRunningBuilds(jobName), gerritChangeNumber, excludePatchsetNumber)
- .stream().map{it -> it.number}.collect(java.util.stream.Collectors.toList())
+ def gerrit = new com.mirantis.mk.Gerrit()
+ def jenkinsUtils = new com.mirantis.mk.JenkinsUtils()
+ def triggeredBuilds= gerrit.getGerritTriggeredBuilds(jenkinsUtils.getJobRunningBuilds(jobName), gerritChangeNumber, excludePatchsetNumber)
+ def buildNums =[]
+ for(int i=0;i<triggeredBuilds.size();i++){
+ buildNums.put(triggeredBuilds[i].number)
+ }
+ return buildNums
}