X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-engine.yaml;h=c6fb7e14264e7a20229bcc825cd8a4da20d73369;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=a5d3d1ad5c132cd8de11a031f5bea8c75e670c84;hpb=f6d92e9bc27e865592a14b06a269d6f14ea21bbf;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 a5d3d1ad..c6fb7e14 100644
--- 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:
@@ -118,10 +114,6 @@
           name: YARDSTICK_DISPATCHER
           default: '{yardstick-dispatcher}'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'true'
-          description: 'Cleanup leftovers of the previous run'
 
     properties:
       - logrotate
@@ -131,7 +123,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
@@ -140,7 +135,7 @@
 
     wrappers:
       - build-timeout:
-          timeout: 210
+          timeout: 240
       - fix-workspace-permissions
 
     scm:
@@ -167,7 +162,6 @@
                 USE_PREBUILT_DEPLOYMENT_IMAGE=$USE_PREBUILT_DEPLOYMENT_IMAGE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                CLEANUP=$CLEANUP
               git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
@@ -185,7 +179,6 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -202,7 +195,6 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -210,7 +202,7 @@
 - job-template:
     name: 'cloud-infra-periodic-{distro}-{phase}-{type}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -261,9 +253,6 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - build-timeout: