feat(Jenkinsfile): no e2e retry logic if master

Vaughn Dice · Vaughn Dice · commit f39002129337 · 2016-07-26T08:48:25.000-06:00
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -143,8 +143,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' />
@@ -158,9 +159,10 @@ Commit: ${env.CHANGE_TITLE}<br/>
 </div>
 </html>
 """, from: 'jenkins@ci.deis.io', subject: 'Controller-sdk-go 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
`@@ -143,8 +143,9 @@ waitUntil {`
`143`	`143`	`true`
`144`	`144`	`} catch(error) {`
`145`	`145`	`node('linux') {`
`146`		`- withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {`
`147`		`- mail body: """<!DOCTYPE html>`
	`146`	`+ if (git_branch != "remotes/origin/master") {`
	`147`	`+ withCredentials([[$class: 'StringBinding', credentialsId: '8a727911-596f-4057-97c2-b9e23de5268d', variable: 'SLACKEMAIL']]) {`
	`148`	`+ mail body: """<!DOCTYPE html>`
`148`	`149`	`<html>`
`149`	`150`	`<head>`
`150`	`151`	`<meta content='text/html; charset=UTF-8' http-equiv='Content-Type' />`
`@@ -158,9 +159,10 @@ Commit: ${env.CHANGE_TITLE}<br/>`
`158`	`159`	`</div>`
`159`	`160`	`</html>`
`160`	`161`	`""", from: 'jenkins@ci.deis.io', subject: 'Controller-sdk-go E2E Test Failure', to: env.SLACKEMAIL, mimeType: 'text/html'`
	`162`	`+ }`
	`163`	`+ input "Retry the e2e tests?"`
`161`	`164`	`}`
`162`	`165`	`}`
`163`		`- input "Retry the e2e tests?"`
`164`		`- false`
	`166`	`+ false`
`165`	`167`	`}`
`166`	`168`	`}`