fix(CI): False doesn't abort build (#158)

deis · Aug 1, 2016 · 1f412af · 1f412af
1 parent 9d52c27
commit 1f412af
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,7 @@ def make = { String target ->
 		sh "make ${target} fileperms"
 	} catch(error) {
 		sh "make fileperms"
-		false
+		throw error
 	}
 }
 
@@ -24,7 +24,7 @@ def gcs_cmd = { String cmd ->
 		sh(gcs_cmd + cmd)
 	} catch(error) {
 		sh(gcs_cmd + gcs_cleanup_cmd)
-		error 'gcs error'
+		throw error
 	}
 }
 
@@ -184,10 +184,13 @@ waitUntil {
 		}
 		true
 	} catch(error) {
+		if (git_branch == "remotes/origin/master") {
+			throw error
+		}
+
 		node('linux') {
-			if (git_branch != "remotes/origin/master") {
-				withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {
-					mail body: """<!DOCTYPE html>
+			withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {
+				mail body: """<!DOCTYPE html>
 <html>
 <head>
 <meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />
@@ -201,10 +204,8 @@ Commit: ${env.CHANGE_TITLE}<br/>
 </div>
 </html>
 """, from: '[email protected]', subject: 'Workflow CLI E2E Test Failure', to: env.SLACKEMAIL, mimeType: 'text/html'
-				}
-				input "Retry the e2e tests?"
 			}
+			input "Retry the e2e tests?"
 		}
-	false
 	}
 }