X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=5cf2eace88c70d1497d6b5aac8096ee70e2cfe99;hb=d48647dcfa5724ec1ebdb4b883580e3f3ad48215;hp=31b5f67a713105ba51a716717a01eb942dbfd4b9;hpb=eef6c2d819e69db757888c7fd66d6e854cf84a3b;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 31b5f67a..5cf2eace 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -60,12 +60,18 @@
           dib_os_element: 'centos-minimal'
 
     type:
-      - virtual
+      - virtual:
+          slave-label: 'vpod-deploy-city'
+      - baremetal:
+          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}'
@@ -87,12 +93,16 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'vpod-deploy-{os}'
+          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
           default: '{distribution}'
           description: 'Distribution to use for configuring target nodes (networking etc.)'
+      - string:
+          name: DEPLOY_TYPE
+          default: '{type}'
+          description: 'Type of the deployment'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'true'
@@ -115,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
@@ -128,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-.*'
@@ -139,10 +150,8 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: 210
       - fix-workspace-permissions
-      - openstack:
-          single-use: True
 
     scm:
       - git-scm:
@@ -151,7 +160,7 @@
           refspec: ''
 
     triggers:
-      - timed: 'H H/2 * * *'
+      - timed: 'H H/3 * * *'
 
     builders:
       - multijob:
@@ -162,6 +171,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                DEPLOY_TYPE=$DEPLOY_TYPE
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 IPA_DIB_OS_ELEMENT=$IPA_DIB_OS_ELEMENT
                 DIB_OS_RELEASE=$DIB_OS_RELEASE
@@ -180,6 +190,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                DEPLOY_TYPE=$DEPLOY_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 CLEANUP=$CLEANUP
@@ -194,6 +205,7 @@
               current-parameters: true
               predefined-parameters: |
                 DISTRIBUTION=$DISTRIBUTION
+                DEPLOY_TYPE=$DEPLOY_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 CLEANUP=$CLEANUP
@@ -219,6 +231,10 @@
           name: DISTRIBUTION
           default: 'ubuntu18'
           description: 'Distribution to use for configuring target nodes (networking etc.). Overriden by upstream job.'
+      - string:
+          name: DEPLOY_TYPE
+          default: 'virtual'
+          description: 'Type of the deployment. Overriden by upstream job.'
       - string:
           name: USE_PREBUILT_DEPLOYMENT_IMAGE
           default: 'false'
@@ -249,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
@@ -261,7 +277,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 120
+          timeout: '{build-timeout}'
       - fix-workspace-permissions
 
     scm: