diff --git a/jobs/Jenkinsfile_BuildAll b/jobs/Jenkinsfile_BuildAll index 82b7779..084872b 100644 --- a/jobs/Jenkinsfile_BuildAll +++ b/jobs/Jenkinsfile_BuildAll @@ -82,10 +82,14 @@ pipeline { for (machine in listOfTargets) { if(isMachineSane(machine)) { println "BUILDING ${machine}" - def buildjob = runBuildJob(common, machine, "${params.BUILD_BRANCH}") - if((buildJob.getResult() != 'SUCCESS') && isBuildSuccess) { - isBuildSuccess = false - firstMachineFailing = machine + catchError(buildResult: 'UNSTABLE', stageResult: 'FAILURE') { + if(!runBuildJob(common, machine, "${params.BUILD_BRANCH}")) { + println "Building ${machine} failed" + if(isBuildSuccess) { + isBuildSuccess = false + firstMachineFailing = machine + } + } } } // end isMachineSane } // end for @@ -155,7 +159,7 @@ def runBuildJob(commonHelpers, buildTarget, buildBranch) { try { buildJob = build(job: "${env.BUILD_IMG_JOB}", quietPeriod: 0, - propagate: false, + propagate: true, wait: true, parameters: [string(name: 'TARGET', value: buildTarget), string(name: 'BUILD_BRANCH', value: buildBranch), @@ -174,8 +178,5 @@ def runBuildJob(commonHelpers, buildTarget, buildBranch) { error("Something went really wrong with ${env.BUILD_IMG_JOB} (TARGET=${buildTarget})") return } - if(buildJob.getResult() != 'SUCCESS') { - currentBuild.result = 'FAILURE' - } - return buildJob + return (buildJob.getResult() != 'SUCCESS') }