Merge "ci: Synchronize Nordix repositories regularly with upstream"

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-engine.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index a5d3d1ad5c132cd8de11a031f5bea8c75e670c84..15857faa0d9484d66031f58fbc5887efca52d4d1 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -45,24 +45,20 @@
           branch: '{stream}'
 
     distro:
-      - ubuntu1804
-      - centos7
+      - ubuntu1804:
+          slave-label: vpod-deploy-ubuntu1804
+      - centos7:
+          slave-label: vpod-deploy-centos7
 
     type:
       - virtual:
-          slave-label: 'vpod-deploy-city'
           yardstick-dispatcher: 'file'
           build-trigger: 'H H/3 * * *'
           disabled: true
-      - baremetal:
-          slave-label: 'baremetal-deploy'
-          yardstick-dispatcher: 'influxdb'
-          build-trigger: '@daily'
-          disabled: true
 
     phase:
       - deploy:
-          build-timeout: 60
+          build-timeout: 90
       - functest:
           build-timeout: 120
       - yardstick:
@@ -132,6 +128,7 @@
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
             - 'k8-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -140,7 +137,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 240
       - fix-workspace-permissions
 
     scm: