X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fkubernetes-periodic-jobs%2Fkubernetes-offline-release-jobs.yaml;h=0bfd4fb96e70a343bda2c690636c03c1de956719;hb=26d913bb9246e02040ba09f2fd0376eb2bb7f493;hp=a04d71840344a0b634e93e14315b5ad8d56c631f;hpb=6af3e786fd4a2ad0f795c262b64343790671879e;p=infra%2Fcicd.git

diff --git a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
index a04d7184..0bfd4fb9 100644
--- a/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
+++ b/jjb/engine/kubernetes-periodic-jobs/kubernetes-offline-release-jobs.yaml
@@ -36,7 +36,7 @@
 
     cloud:
       - city:
-          openrc-credentials-file: 'est-jenkins-openrcfile-city-karlskrona-onap'
+          openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-cicd'
 
     jobs:
       - 'kubernetes-periodic-release-{environment-type}-{distro}'
@@ -67,7 +67,7 @@
           description: 'Installer type to use'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'k8-calico-nofeature'
+          default: 'k8-multus-plugins'
           description: 'Scenario to deploy and test'
       - string:
           name: VERBOSITY
@@ -99,11 +99,19 @@
           description: 'CI loop type'
       - label:
           name: SLAVE_LABEL
-          default: 'engine-build-ubuntu1804'
+          default: 'engine-package-ubuntu1804-fra'
           description: 'Slave label to schedule this job on.'
 
     properties:
       - logrotate
+      - build-blocker:
+          use-build-blocker: true
+          blocking-jobs:
+            - 'engine-verify-package-.*'
+            - 'onap-sdc-periodic-release-offline-.*'
+            - 'onap-so-periodic-release-offline-.*'
+            - 'kubernetes-periodic-release-offline-.*'
+          block-level: 'NODE'
 
     wrappers:
       - build-timeout:
@@ -140,28 +148,11 @@
               kill-phase-on: FAILURE
               abort-all-job: true
       - multijob:
-          name: release test k8-calico-nofeature
+          name: release test k8-multus-plugins
           condition: SUCCESSFUL
           execution-type: PARALLEL
           projects:
-            - name: 'k8-calico-nofeature-offline-{distro}-baremetal-periodic'
-              current-parameters: false
-              git-revision: false
-              node-parameters: false
-              property-file: "$WORKSPACE/build.properties"
-              predefined-parameters: |
-                EXECUTION_MODE=$EXECUTION_MODE
-                NORDIX_ARM_PUBLIC_IP=$NORDIX_ARM_PUBLIC_IP
-                ARTIFACT_TO_DOWNLOAD=$ARTIFACT_TO_DOWNLOAD
-                VERBOSITY=$VERBOSITY
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: release test k8-multus-nofeature
-          condition: SUCCESSFUL
-          execution-type: PARALLEL
-          projects:
-            - name: 'k8-multus-nofeature-offline-{distro}-baremetal-periodic'
+            - name: 'k8-multus-plugins-offline-{distro}-baremetal-periodic'
               current-parameters: false
               git-revision: false
               node-parameters: false