X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-kubernetes.yaml;h=ea706b76f317c8b516e94b26f5885ee9c55213ec;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=0214b7a9bcb461ab0d04e1a0912888c5f734ae8b;hpb=06094c2722f9eb1776bb292d09773f7bcf45dc44;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
index 0214b7a9..ea706b76 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-kubernetes.yaml
@@ -43,21 +43,25 @@
     stream:
       - 'master':
           branch: '{stream}'
-          disabled: 'false'
 
     distro:
-      - ubuntu1804:
-          disabled: 'false'
-      - centos7:
-          disabled: 'true'
+      - ubuntu1804
+#      - centos7:
+#          disabled: 'true'
 
     deploy-scenario:
-      - k8-calico-nofeature
-      - k8-flannel-nofeature
-      - k8-canal-nofeature
-      - k8-cilium-nofeature
-      - k8-weave-nofeature
-      - k8-multus-nofeature
+      - k8-calico-nofeature:
+          disabled: 'true'
+      - k8-flannel-nofeature:
+          disabled: 'true'
+      - k8-canal-nofeature:
+          disabled: 'true'
+      - k8-cilium-nofeature:
+          disabled: 'true'
+      - k8-weave-nofeature:
+          disabled: 'true'
+      - k8-multus-nofeature:
+          disabled: 'true'
 
     ci-loop:
       - daily
@@ -134,19 +138,19 @@
           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
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
+            - 'cloud-infra-verify-engine-.*'
+            - 'cloud-infra-verify-scenario-.*'
             - 'cloud-infra-periodic-engine-.*'
+            - 'onap-.*'
             - 'k8-.*'
             - 'os-.*'
+            - 'nolabs-.*'
           block-level: 'NODE'
       - throttle:
           max-per-node: 1
@@ -185,7 +189,6 @@
                 PROVISIONER_TYPE=$PROVISIONER_TYPE
                 INSTALLER_TYPE=$INSTALLER_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                CLEANUP=$CLEANUP
               git-revision: true
               node-parameters: true
               kill-phase-on: FAILURE
@@ -204,7 +207,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
@@ -222,7 +224,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
@@ -230,7 +231,7 @@
           name: promote
           condition: SUCCESSFUL
           projects:
-            - name: 'scenario-{distro}-promote-{type}-{ci-loop}-{stream}'
+            - name: 'kubernetes-promote-{distro}-{installer-type}-{type}-{ci-loop}-{stream}'
               current-parameters: true
               predefined-parameters: |
                 DISTRO=$DISTRO
@@ -240,7 +241,6 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
                 YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
-                CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: FAILURE
               abort-all-job: true
@@ -248,7 +248,7 @@
 - job-template:
     name: 'kubernetes-{phase}-{distro}-kubespray-{type}-{ci-loop}-{stream}'
 
-    disabled: false
+    disabled: true
 
     concurrent: true
 
@@ -303,9 +303,6 @@
           name: YARDSTICK_DISPATCHER
           default: 'file'
           description: 'Dispatcher to use for Yardstick reporting'
-      - string:
-          name: CLEANUP
-          default: 'false'
 
     wrappers:
       - build-timeout: