feat(Jenkinsfile): no retry prompt if master

deis · Jul 25, 2016 · f59bb66 · f59bb66
1 parent 70df6e0
commit f59bb66
Showing 1 changed file with 6 additions and 4 deletions.
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
 	}
 }