Fix #5166: IRC notification if either smoke or unit tests fail during…

… deploy
mozilla · Oct 12, 2017 · b3877a3 · b3877a3
1 parent 44b444f
commit b3877a3
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/jenkins/default.groovy b/jenkins/default.groovy
@@ -28,20 +28,20 @@ stage ('Build Images') {
 if ( config.smoke_tests ) {
     milestone()
     stage ('Test Images') {
-        parallel([
-            smoke_tests: utils.integrationTestJob('smoke'),
-            unit_tests: {
-                node {
-                    unstash 'scripts'
-                    try {
+        try {
+            parallel([
+                smoke_tests: utils.integrationTestJob('smoke'),
+                unit_tests: {
+                    node {
+                        unstash 'scripts'
                         sh 'docker/bin/run_tests.sh'
-                    } catch(err) {
-                        utils.ircNotification([stage: 'Unit Test', status: 'failure'])
-                        throw err
                     }
-                }
-            },
-        ])
+                },
+            ])
+        } catch(err) {
+            utils.ircNotification([stage: 'Unit Test', status: 'failure'])
+            throw err
+        }
     }
 }