update

apache · Jul 17, 2023 · be96520 · be96520
1 parent 04504c2
commit be96520
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.ci/jenkins/Jenkinsfile b/.ci/jenkins/Jenkinsfile
@@ -77,10 +77,18 @@ Closure createBuildAndTestStageClosure(String image) {
             buildParams.add(string(name: 'TARGET_BRANCH', value: getChangeTarget()))
             buildParams.add(string(name: 'BUILD_KOGITO_APPS_REF', value: getChangeTarget()))
 
-            build(job: "${getRepoName()}.build-image", wait: false, parameters: buildParams, propagate: false)
-
             githubscm.prepareCommitStatusInformationForPullRequest(getRepoName(), getChangeAuthor(), getChangeBranch(), 'kiegroup', getGitAuthorCredentialsId())
             githubscm.updateGithubCommitStatus(image, 'PENDING', 'Queued', getRepoName())
+
+            // Keep executing so we can cancel all if needed
+            def job = build(job: "${getRepoName()}.build-image", wait: true, parameters: buildParams, propagate: false)
+            if (job.result != 'SUCCESS') {
+                if (job.result == 'UNSTABLE') {
+                    unstable("Tests on ${image} seems to have failed")
+                } else {
+                    error("Error building ${image}. Please check the logs of the job: ${job.absoluteUrl}")
+                }
+            }
         }
     }
 }

diff --git a/.ci/jenkins/dsl/jobs.groovy b/.ci/jenkins/dsl/jobs.groovy
@@ -53,14 +53,14 @@ void setupPrJob(boolean isProdCI = false) {
         run_only_for_branches: [ "${GIT_BRANCH}" ],
         disable_status_message_error: true,
         disable_status_message_failure: true,
-        commitContext: 'Launch Image Checks',
+        commitContext: 'Retrieve and Launch Image Checks',
         contextShowtestResults: false,
     ])
     if (isProdCI) {
         jobParams.job.name += '.prod'
         jobParams.pr.trigger_phrase = '.*[j|J]enkins,?.*(rerun|run) [prod|Prod|PROD].*'
         jobParams.pr.trigger_phrase_only = true
-        jobParams.pr.commitContext = '(Prod) Launch Image Checks'
+        jobParams.pr.commitContext = '(Prod) Retrieve and Launch Image Checks'
         jobParams.env.put('PROD_CI', true)
     } else if (Utils.hasBindingValue(this, 'CLOUD_IMAGES')) {
         jobParams.env.put('IMAGES_LIST', Utils.getBindingValue(this, 'CLOUD_IMAGES'))