X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fcloud-infra%2Fcloud-infra-periodic-spinnaker.yaml;h=cbda1d280821389ca80489814d5b85b2ee791e2f;hb=c00cedffe982bf43c0cfebc3872ef947ed3f2b2d;hp=49305c08cf705cbccd36be90963e27a7f580984c;hpb=2dacaf5d621dfa8dcb78cddd7013dae047a12bde;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..cbda1d28 100644
--- 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"