X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-spinnaker.yaml;h=55d17c8ece98df9fb4c5903a9326a8943bedb3be;hb=411bad54ec6a0d4e4ea546264678e86566421b0f;hp=49305c08cf705cbccd36be90963e27a7f580984c;hpb=ba170a488d9d3219fbc9121c37df9f06c1a49801;p=infra%2Fcicd.git

diff --git a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
index 49305c08..55d17c8e 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -30,7 +30,7 @@
 
     cloud:
       - city:
-          slave-label: 'city-jumphost-ubuntu1804'
+          slave-label: 'engine-jumphost-online-ubuntu1804'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
           daily-trigger: '@daily'
 
@@ -42,16 +42,7 @@
           deploy-scenario: 'k8-calico-spinnaker'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
-          disabled: false
-          delete-stack: 'yes'
-      # TODO: delete 1_16
-      - '1_16':
-          nordix-branch: master
-          engine-version: master
-          engine-refspec: master
-          deploy-scenario: 'k8-calico-spinnaker'
-          deploy-scenario-version: master
-          deploy-scenario-refspec: master
+          keypair-name: 'keypair-nordix-cicd-{deploy-scenario}-1_16'
           disabled: true
           delete-stack: 'yes'
 
@@ -128,6 +119,9 @@
       - string:
           name: STACK_NAME
           default: 'nordix-cicd-{deploy-scenario}-{spinnaker-branch}'
+      - string:
+          name: KEYPAIR_NAME
+          default: '{keypair-name}'
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: "heat-environment-full.yaml"
@@ -162,9 +156,13 @@
       - 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
@@ -309,7 +307,7 @@
       - nordix-gerrit-parameters
       - label:
           name: SLAVE_LABEL
-          default: 'city-jumphost-ubuntu1804'
+          default: 'engine-jumphost-online-ubuntu1804'
           description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
       - string:
           name: PROVISIONER_TYPE
@@ -348,7 +346,7 @@
           description: 'Heat environment filename to use for creating the stack'
       - string:
           name: HEAT_ENVIRONMENT_FILE
-          default: "file://$WORKSPACE/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
+          default: "file:///opt/engine/.cache/repos/swconfig/scenarios/$DEPLOY_SCENARIO/$INSTALLER_TYPE/role/$DEPLOY_SCENARIO/files/$HEAT_ENVIRONMENT_FILENAME"
           description: 'Heat environment file location to use for creating the stack'
       - string:
           name: ENGINE_VERSION