From 2f9aeacc2fbc8050cbb567853f209f5e36ccfec0 Mon Sep 17 00:00:00 2001
From: Jeffrey Hogan <jeffrey.hogan@wpengine.com>
Date: Wed, 1 Nov 2017 15:13:17 -0500
Subject: [PATCH] Timeout requests for input and deploys for now

---
 Jenkinsfile | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f290ac317a8d..ccedcb7e837c 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -47,16 +47,17 @@ timestamps {
 						milestone 1 // 'Vault AMI Baked'
 						lock(resource: 'vault-packer-build-ami', inversePrecedence: true) {
 							withCredentials(packerCredentials) {
-								try {
-									stage('Build AMI') {
-										//sh 'echo hullo'
+								stage('Build AMI') {
+									try {
 										sh 'make packer-build-ami'
-									}
-								} catch(error) {
-									echo "First build failed, sometimes packer randomly times out waiting for SSH?"
-									retry(1) {
-										input "Retry the job again with the debug flag set?"
-										sh 'make packer-debug-ami'
+									} catch(error) {
+										echo "First build failed, sometimes packer randomly times out waiting for SSH?"
+										retry(1) {
+											timeout 600 {  // fail out if no one has clicked the retry button with 10 minutes
+												input "Retry the job again with the debug flag set?"
+												sh 'make packer-debug-ami'
+											}
+										}
 									}
 								}
 							}
@@ -65,9 +66,11 @@ timestamps {
 						milestone 2 // 'Vault Terraform Module Deployed to AWS Development'
 						lock(resource: 'vault-terraform-deploy-to-dev', inversePrecedence: true) {
 							stage('Deploy to Dev') {
-								terraform.apply {
-									terraformDir = "./terraform/aws/development"
-									hipchatRoom = "Vault Monitoring"
+								timeout 1200 {  // fail out if no one has clicked the deploy button with 20 minutes
+									terraform.apply {
+										terraformDir = "./terraform/aws/development"
+										hipchatRoom = "Vault Monitoring"
+									}
 								}
 							}