From c5c05f7395670027d7b625400ea0bf5355063bfa Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Thu, 14 Dec 2017 12:06:54 -0500 Subject: [PATCH] Use setResult instead of getExecutor().interrupt to set FAILURE getExecutor().interrupt(FAILURE) flag the build as aborted event if the final status is FAILURE. This influence triggers such as email. 07:28:26 lttng-modules_VERSION_param-build #334163 (v4.12.14) completed with status SUCCESS 07:28:26 lttng-modules_VERSION_param-build #334160 (v4.15-rc3) completed with status FAILURE ... 07:28:26 lttng-modules_VERSION_param-build #334220 (v2.6.37.6) completed with status SUCCESS 07:28:26 Build was aborted Marked as "aborted". 07:28:26 Started calculate disk usage of build 07:28:26 Finished Calculation of disk usage of build in 0 seconds 07:28:26 Started calculate disk usage of workspace 07:28:26 Finished Calculation of disk usage of workspace in 0 seconds 07:28:26 [WS-CLEANUP] Deleting project workspace...[WS-CLEANUP] done 07:28:26 No emails were triggered. An email should have been fired here. 07:28:26 Finished: FAILURE Final status is Failure. But no email were sent. Signed-off-by: Jonathan Rajotte --- scripts/latency-tracker/master-rt.groovy | 2 +- scripts/latency-tracker/master.groovy | 2 +- scripts/lttng-modules/master-rt.groovy | 2 +- scripts/lttng-modules/master.groovy | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/latency-tracker/master-rt.groovy b/scripts/latency-tracker/master-rt.groovy index 9d94be2..33eb0f3 100644 --- a/scripts/latency-tracker/master-rt.groovy +++ b/scripts/latency-tracker/master-rt.groovy @@ -354,7 +354,7 @@ for (b in allBuilds) { // Mark this build failed if any child build has failed if (isFailed) { - build.getExecutor().interrupt(Result.FAILURE) + build.setResult(hudson.model.Result.FAILURE) } // EOF diff --git a/scripts/latency-tracker/master.groovy b/scripts/latency-tracker/master.groovy index a8bf945..323351c 100644 --- a/scripts/latency-tracker/master.groovy +++ b/scripts/latency-tracker/master.groovy @@ -528,7 +528,7 @@ for (b in allBuilds) { // Mark this build failed if any child build has failed if (isFailed) { - build.getExecutor().interrupt(Result.FAILURE) + build.setResult(hudson.model.Result.FAILURE) } // EOF diff --git a/scripts/lttng-modules/master-rt.groovy b/scripts/lttng-modules/master-rt.groovy index 9d94be2..33eb0f3 100644 --- a/scripts/lttng-modules/master-rt.groovy +++ b/scripts/lttng-modules/master-rt.groovy @@ -354,7 +354,7 @@ for (b in allBuilds) { // Mark this build failed if any child build has failed if (isFailed) { - build.getExecutor().interrupt(Result.FAILURE) + build.setResult(hudson.model.Result.FAILURE) } // EOF diff --git a/scripts/lttng-modules/master.groovy b/scripts/lttng-modules/master.groovy index a8bf945..323351c 100644 --- a/scripts/lttng-modules/master.groovy +++ b/scripts/lttng-modules/master.groovy @@ -528,7 +528,7 @@ for (b in allBuilds) { // Mark this build failed if any child build has failed if (isFailed) { - build.getExecutor().interrupt(Result.FAILURE) + build.setResult(hudson.model.Result.FAILURE) } // EOF -- 2.34.1