From: Robert Tomczyk <robert.tomczyk@est.tech>
Date: Mon, 29 Jul 2019 09:56:10 +0000 (+0000)
Subject: Merge "GEODE: Make sure the git tag in correct format is present"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=0935c258f8f5b216055eff19c92162a7206a7fb7;hp=dd212f7c3b443fa43a5654e05cc5e6c5eb312a43;p=infra%2Fcicd.git

Merge "GEODE: Make sure the git tag in correct format is present"
---

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 9671f8ae..e966bf39 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 c1e43456..37250b68 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 705b83d3..12e14a20 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 f05643ff..249d198c 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