Increase build-timeout value for cloud-infra jobs

Change-Id: I648ef50a6f88e77dc62e16ff6d0461f8b73185d2
diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 9671f8a..e966bf3 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -58,7 +58,7 @@
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
           build-timeout: 120
       - yardstick:
@@ -136,7 +136,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 240
       - fix-workspace-permissions
 
     scm:
diff --git a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
index c1e4345..37250b6 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-scenario.yaml
@@ -72,7 +72,7 @@
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
           build-timeout: 120
       - yardstick:
@@ -150,7 +150,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 245
       - fix-workspace-permissions
 
     scm:
diff --git a/jjb/cloud-infra/cloud-infra-verify-engine.yaml b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
index 705b83d..12e14a2 100644
--- a/jjb/cloud-infra/cloud-infra-verify-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-engine.yaml
@@ -71,8 +71,10 @@
       - virtual
 
     phase:
-      - deploy
-      - functest
+      - deploy:
+          build-timeout: 90
+      - functest:
+          build-timeout: 30
 
     jobs:
       - 'cloud-infra-verify-engine-{distro}-{type}-{stream}'
@@ -271,7 +273,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm:
diff --git a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
index f05643f..249d198 100644
--- a/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
+++ b/jjb/cloud-infra/cloud-infra-verify-scenario.yaml
@@ -69,7 +69,7 @@
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
           build-timeout: 30
 
@@ -133,7 +133,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 90
+          timeout: 120
       - fix-workspace-permissions
       - openstack:
           single-use: True