Added flag to abort build

Author: annaibm

buildenv/jenkins/openjdk_tests

@@ -413,6 +413,7 @@ timestamps{
 }
 
 def runTest() {
+	boolean wasAborted = false
     try {
         def retry_count = 0
         def sleep_time = 180
@@ -490,17 +491,18 @@ def runTest() {
         println("Exception: " + e.toString())
         // build result may not be updated correctly at the moment (see https://issues.jenkins.io/browse/JENKINS-56402)
         // if there is an exception, set currentBuild.result to ABORTED/FAILURE
-        if (e.toString().contains("FlowInterruptedException") || currentBuild.rawBuild.getExecutor()?.isInterrupted()) {
-            currentBuild.result = 'ABORTED'
+        if (e.toString().contains("FlowInterruptedException")) {
+            wasAborted = true
+			currentBuild.result = 'ABORTED'
             echo "Build aborted by user or another trigger."
         } else {
             currentBuild.result = 'FAILURE'
         }
 
     } finally {
-		if (currentBuild.rawBuild.getExecutor()?.isInterrupted()) {
+		if (wasAborted) {
             currentBuild.result = 'ABORTED'
-            echo "Build aborted by user or another trigger."
+            echo "aborted build."
         }
         if (params.SLACK_CHANNEL) {
             timeout(time: 5, unit: 'MINUTES') {