Fix Slack notification error handling and remove some debug code

brianseeders · brianseeders · commit f95ed33df2d7 · 2020-05-04T10:51:04.000-04:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -8,11 +8,6 @@ kibanaPipeline(timeoutMinutes: 135, checkPrChanges: true) {
     githubPr.withDefaultPrComments {
       catchError {
         retryable.enable()
-        catchError {
-          slackNotifications.onFailure {
-            error "Test Error"
-          }
-        }
         slackNotifications.onFailure {
           parallel([
             'kibana-intake-agent': workers.intake('kibana-intake', './test/scripts/jenkins_unit.sh'),
diff --git a/vars/slackNotifications.groovy b/vars/slackNotifications.groovy
@@ -100,14 +100,15 @@ def getTestFailures() {
 }
 
 def onFailure(Map options = [:], Closure closure) {
-  try {
+  // try/finally will NOT work here, because the build status will not have been changed to ERROR when the finally{} block executes
+  catchError {
     closure()
-  } finally {
-    def status = buildUtils.getBuildStatus()
-    if (status != "SUCCESS" && status != "UNSTABLE") {
-      catchErrors {
-        sendFailedBuild(options)
-      }
+  }
+
+  def status = buildUtils.getBuildStatus()
+  if (status != "SUCCESS" && status != "UNSTABLE") {
+    catchErrors {
+      sendFailedBuild(options)
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -100,14 +100,15 @@ def getTestFailures() {`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`def onFailure(Map options = [:], Closure closure) {`
`103`		`- try {`
	`103`	`+ // try/finally will NOT work here, because the build status will not have been changed to ERROR when the finally{} block executes`
	`104`	`+ catchError {`
`104`	`105`	`closure()`
`105`		`- } finally {`
`106`		`- def status = buildUtils.getBuildStatus()`
`107`		`- if (status != "SUCCESS" && status != "UNSTABLE") {`
`108`		`- catchErrors {`
`109`		`- sendFailedBuild(options)`
`110`		`- }`
	`106`	`+ }`
	`107`	`+`
	`108`	`+ def status = buildUtils.getBuildStatus()`
	`109`	`+ if (status != "SUCCESS" && status != "UNSTABLE") {`
	`110`	`+ catchErrors {`
	`111`	`+ sendFailedBuild(options)`
`111`	`112`	`}`
`112`	`113`	`}`
`113`	`114`	`}`