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

Joshua-Anderson · web-flow · commit 1f412afd5351 · 2016-08-01T16:58:56.000-07:00
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: 'jenkins@ci.deis.io', subject: 'Workflow CLI E2E Test Failure', to: env.SLACKEMAIL, mimeType: 'text/html'
-				}
-				input "Retry the e2e tests?"
 			}
+			input "Retry the e2e tests?"
 		}
-	false
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ def make = { String target ->`
`10`	`10`	`sh "make ${target} fileperms"`
`11`	`11`	`} catch(error) {`
`12`	`12`	`sh "make fileperms"`
`13`		`- false`
	`13`	`+ throw error`
`14`	`14`	`}`
`15`	`15`	`}`
`16`	`16`
`@@ -24,7 +24,7 @@ def gcs_cmd = { String cmd ->`
`24`	`24`	`sh(gcs_cmd + cmd)`
`25`	`25`	`} catch(error) {`
`26`	`26`	`sh(gcs_cmd + gcs_cleanup_cmd)`
`27`		`- error 'gcs error'`
	`27`	`+ throw error`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`@@ -184,10 +184,13 @@ waitUntil {`
`184`	`184`	`}`
`185`	`185`	`true`
`186`	`186`	`} catch(error) {`
	`187`	`+ if (git_branch == "remotes/origin/master") {`
	`188`	`+ throw error`
	`189`	`+ }`
	`190`	`+`
`187`	`191`	`node('linux') {`
`188`		`- if (git_branch != "remotes/origin/master") {`
`189`		`- withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {`
`190`		`- mail body: """<!DOCTYPE html>`
	`192`	`+ withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {`
	`193`	`+ mail body: """<!DOCTYPE html>`
`191`	`194`	`<html>`
`192`	`195`	`<head>`
`193`	`196`	`<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />`
`@@ -201,10 +204,8 @@ Commit: ${env.CHANGE_TITLE}<br/>`
`201`	`204`	`</div>`
`202`	`205`	`</html>`
`203`	`206`	`""", from: 'jenkins@ci.deis.io', subject: 'Workflow CLI E2E Test Failure', to: env.SLACKEMAIL, mimeType: 'text/html'`
`204`		`- }`
`205`		`- input "Retry the e2e tests?"`
`206`	`207`	`}`
	`208`	`+ input "Retry the e2e tests?"`
`207`	`209`	`}`
`208`		`- false`
`209`	`210`	`}`
`210`	`211`	`}`