cloud-infra: Adjust build blockers

[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 4e0ced5297d9f2c6cceac36e3766a7413095ebb4..9ee1c1b32962b456a9a291d871728e73c0a3dc09 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -43,27 +43,22 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
     distro:
       - ubuntu1804:
-          disabled: 'false'
+          slave-label: vpod-deploy-ubuntu1804
       - centos7:
-          disabled: 'true'
+          slave-label: vpod-deploy-centos7
 
     type:
       - virtual:
-          slave-label: 'vpod-deploy-city'
           yardstick-dispatcher: 'file'
           build-trigger: 'H H/3 * * *'
-      - 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,7 +127,10 @@
             - 'cloud-infra-verify-engine-.*'
             - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
+            - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -141,7 +139,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 240
       - fix-workspace-permissions
 
     scm:
@@ -149,6 +147,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: ''
+          wipe_workspace: true
+          clean_before: false
 
     triggers:
       - timed: '{build-trigger}'
@@ -274,6 +274,8 @@
           ssh-credentials-id: nordixinfra-nordix-gerrit-ssh
           branch: '{branch}'
           refspec: ''
+          wipe_workspace: true
+          clean_before: false
 
     builders:
       - 'cloud-infra-{phase}-macro'