From c1e85cb97340984862ad79c58aacb1446a7f3473 Mon Sep 17 00:00:00 2001
From: Adam Gandelman <adamg@ubuntu.com>
Date: Tue, 23 Sep 2014 21:51:39 -0700
Subject: [PATCH] Bump BUILD_TIMEOUT for both Ironic drivers

BUILD_TIMEOUT is currently bumped from its default 196s to
300s for the Ironic agent_ssh deploy driver.  Enabling parallel
Tempest testing of the pxe_ssh fails periodically due to build
timeouts, likely due to concurrent deployments generating lots of
i/o.  This bumps the timeout for all Ironic jobs.

Change-Id: I638aa18c77d7a60e03df7bb8039dbd532cafa7ab
---
 devstack-vm-gate.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devstack-vm-gate.sh b/devstack-vm-gate.sh
index 0a9dc981..3106231c 100755
--- a/devstack-vm-gate.sh
+++ b/devstack-vm-gate.sh
@@ -142,6 +142,7 @@ EOF
         echo "IRONIC_VM_COUNT=3" >>localrc
         echo "IRONIC_VM_LOG_DIR=$BASE/$LOCALRC_OLDNEW/ironic-bm-logs" >>localrc
         echo "DEFAULT_INSTANCE_TYPE=baremetal" >>localrc
+        echo "BUILD_TIMEOUT=300" >>localrc
         if [[ "$DEVSTACK_GATE_IRONIC_BUILD_RAMDISK" -eq 0 ]]; then
             echo "IRONIC_BUILD_DEPLOY_RAMDISK=False" >>localrc
         fi
@@ -151,8 +152,6 @@ EOF
             echo "IRONIC_DEPLOY_DRIVER=agent_ssh" >>localrc
             # agent driver doesn't support ephemeral volumes yet
             echo "IRONIC_VM_EPHEMERAL_DISK=0" >>localrc
-            # agent driver is a bit slow
-            echo "BUILD_TIMEOUT=300" >>localrc
         else
             echo "IRONIC_VM_EPHEMERAL_DISK=1" >>localrc
         fi