Merge pull request #150 from vdice/no-retry-if-master

Vaughn Dice · web-flow · commit 44f50850118d · 2016-07-25T15:20:05.000-06:00
feat(Jenkinsfile): no retry prompt if master
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -135,8 +135,9 @@ waitUntil {
 		true
 	} catch(error) {
 		node('linux') {
-			withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {
-				mail body: """<!DOCTYPE html>
+			if (git_branch != "remotes/origin/master") {
+				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' />
@@ -150,9 +151,10 @@ 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
+	false
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -135,8 +135,9 @@ waitUntil {`
`135`	`135`	`true`
`136`	`136`	`} catch(error) {`
`137`	`137`	`node('linux') {`
`138`		`- withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {`
`139`		`- mail body: """<!DOCTYPE html>`
	`138`	`+ if (git_branch != "remotes/origin/master") {`
	`139`	`+ withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {`
	`140`	`+ mail body: """<!DOCTYPE html>`
`140`	`141`	`<html>`
`141`	`142`	`<head>`
`142`	`143`	`<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />`
`@@ -150,9 +151,10 @@ Commit: ${env.CHANGE_TITLE}<br/>`
`150`	`151`	`</div>`
`151`	`152`	`</html>`
`152`	`153`	`""", from: 'jenkins@ci.deis.io', subject: 'Workflow CLI E2E Test Failure', to: env.SLACKEMAIL, mimeType: 'text/html'`
	`154`	`+ }`
	`155`	`+ input "Retry the e2e tests?"`
`153`	`156`	`}`
`154`	`157`	`}`
`155`		`- input "Retry the e2e tests?"`
`156`		`- false`
	`158`	`+ false`
`157`	`159`	`}`
`158`	`160`	`}`