cloud-infra: Enable daily spinnaker deployments

[infra/cicd.git] / jjb / cloud-infra / cloud-infra-periodic-spinnaker.yaml

diff --git a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
index 2590c422903eec6c01bef71acbf0927209978427..cbda1d280821389ca80489814d5b85b2ee791e2f 100644 (file)
--- 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: '@midnight'
+          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"
@@ -335,7 +339,11 @@
       - string:
           name: HEAT_ENVIRONMENT_FILENAME
           default: "heat-environment-full.yaml"
-          description: 'Heat environment file to use for creating the stack'
+          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"
+          description: 'Heat environment file location to use for creating the stack'
       - string:
           name: ENGINE_VERSION
           default: '{engine-version}'