Fix abort option in pipeline for slack

afdf1df9 · Peter van 't Hof · 5bc58a7a · afdf1df9
Commit afdf1df9 authored Jan 19, 2017 by Peter van 't Hof
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Jenkinsfile Jenkinsfile +4 -2

No files found.
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,8 +31,10 @@ node('local') {
        }

    } catch (e) {
-        currentBuild.result = "FAILED"
-        slackSend (color: '#FF0000', message: "FAILED: Job '${env.JOB_NAME} #${env.BUILD_NUMBER}' (<${env.BUILD_URL}|Open>)", channel: '#biopet-bot', teamDomain: 'lumc', tokenCredentialId: 'lumc')
+        if(currentBuild.result != null && !"FAILED".equals(currentBuild.result)) {
+            currentBuild.result = "FAILED"
+        }
+        slackSend (color: '#FF0000', message: "${currentBuild.result}: Job '${env.JOB_NAME} #${env.BUILD_NUMBER}' (<${env.BUILD_URL}|Open>)", channel: '#biopet-bot', teamDomain: 'lumc', tokenCredentialId: 'lumc')

        throw e
    }