Code Review
/
infra
/
cicd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Rename cloud-infra lint jobs
[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 f7c4b1b0cb97c7ad3d2497781926cb1eb6fcfb3d..52bf8f91fb17615b6157e0fc43ebf04ab1a630f1 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/
jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@
-42,6
+42,7
@@
deploy-scenario: 'k8-calico-spinnaker'
deploy-scenario-version: master
deploy-scenario-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: false
delete-stack: 'yes'
disabled: false
delete-stack: 'yes'
@@
-118,6
+119,9
@@
- string:
name: STACK_NAME
default: 'nordix-cicd-{deploy-scenario}-{spinnaker-branch}'
- 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"
- 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
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
description: 'Heat environment file location to use for creating the stack'
- string:
name: ENGINE_VERSION