X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-spinnaker.yaml;h=52bf8f91fb17615b6157e0fc43ebf04ab1a630f1;hb=5442f172dff09ee089e36f4f7682ffc50323c272;hp=9991f117482aefba742eb86d66b09b7bb5d77b66;hpb=21b1a83629249db48eaf345595cc2cc3fddafc1f;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 9991f117..52bf8f91 100644
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -32,7 +32,7 @@
       - city:
           slave-label: 'city-jumphost-ubuntu1804'
           openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
-          daily-trigger: '#@daily'
+          daily-trigger: '@daily'
 
     spinnaker-branch:
       - '1.16':
@@ -42,6 +42,7 @@
           deploy-scenario: 'k8-calico-spinnaker'
           deploy-scenario-version: master
           deploy-scenario-refspec: master
+          keypair-name: 'keypair-nordix-cicd-{deploy-scenario}-1_16'
           disabled: false
           delete-stack: 'yes'
 
@@ -118,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"
@@ -338,7 +342,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