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 49305c08cf705cbccd36be90963e27a7f580984c..cbda1d280821389ca80489814d5b85b2ee791e2f 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@ -42,18 +42,9 @@
           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'
-      # 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
-          disabled: true
-          delete-stack: 'yes'
 
     distro:
       - ubuntu1804
@@ -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"