X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=5cf2eace88c70d1497d6b5aac8096ee70e2cfe99;hb=7946a5c8faf3c0fb9ea5d4ff6944893efb9dbc00;hp=cbd866eda8b64779eb02f3a8cf8ed0928815717a;hpb=aaf958440c8721300e03ed5e6b88d488b6e63fad;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index cbd866ed..5cf2eace 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -66,9 +66,12 @@
           slave-label: 'baremetal-deploy'
 
     phase:
-      - deploy
-      - functest
-      - yardstick
+      - deploy:
+          build-timeout: 60
+      - functest:
+          build-timeout: 120
+      - yardstick:
+          build-timeout: 30
 
     jobs:
       - 'cloud-infra-periodic-engine-{os}-{type}-{stream}'
@@ -90,7 +93,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-city'
+          default: '{slave-label}'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: DISTRIBUTION
@@ -122,7 +125,7 @@
           description: 'Scenario to deploy and test'
       - string:
           name: TEST_SUITE
-          default: 'healthcheck'
+          default: 'smoke'
           description: 'Test suite to run'
       - string:
           name: CLEANUP
@@ -135,6 +138,7 @@
           use-build-blocker: true
           blocking-jobs:
             - 'cloud-infra-verify-engine-{os}-.*'
+            - 'cloud-infra-verify-scenario-{os}-.*'
             - 'cloud-infra-periodic-engine-{os}-.*'
             - 'cloud-infra-os-.*'
             - 'cloud-infra-k8-.*'
@@ -146,7 +150,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: 210
       - fix-workspace-permissions
 
     scm:
@@ -156,7 +160,7 @@
           refspec: ''
 
     triggers:
-      - timed: 'H H/2 * * *'
+      - timed: 'H H/3 * * *'
 
     builders:
       - multijob:
@@ -261,7 +265,7 @@
           description: 'Test framework to use'
       - string:
           name: TEST_SUITE
-          default: 'healthcheck'
+          default: 'smoke'
           description: 'Test suite to run'
       - string:
           name: TEST_REPO_URL
@@ -273,7 +277,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm: