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
Merge "Revert "GEODE Update branch to: release-nordix/1.11.0""
[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 9991f117482aefba742eb86d66b09b7bb5d77b66..55d17c8ece98df9fb4c5903a9326a8943bedb3be 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/
jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@
-30,9
+30,9
@@
cloud:
- city:
cloud:
- city:
- slave-label: '
city-jumphost
-ubuntu1804'
+ slave-label: '
engine-jumphost-online
-ubuntu1804'
openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
openrc-credentials-file: 'est-jenkins-openrcfile-city-frankfurt-onap'
- daily-trigger: '
#
@daily'
+ daily-trigger: '@daily'
spinnaker-branch:
- '1.16':
spinnaker-branch:
- '1.16':
@@
-42,7
+42,8
@@
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
- disabled: false
+ keypair-name: 'keypair-nordix-cicd-{deploy-scenario}-1_16'
+ disabled: true
delete-stack: 'yes'
distro:
delete-stack: 'yes'
distro:
@@
-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"
@@
-152,9
+156,13
@@
- build-blocker:
use-build-blocker: true
blocking-jobs:
- build-blocker:
use-build-blocker: true
blocking-jobs:
+ - 'cloud-infra-verify-engine-.*'
+ - 'cloud-infra-verify-scenario-.*'
- 'cloud-infra-periodic-engine-.*'
- 'onap-.*'
- 'k8-.*'
- 'cloud-infra-periodic-engine-.*'
- 'onap-.*'
- 'k8-.*'
+ - 'os-.*'
+ - 'nolabs-.*'
block-level: 'NODE'
- throttle:
max-per-node: 1
block-level: 'NODE'
- throttle:
max-per-node: 1
@@
-299,7
+307,7
@@
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
- default: '
city-jumphost
-ubuntu1804'
+ default: '
engine-jumphost-online
-ubuntu1804'
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
name: PROVISIONER_TYPE
description: 'Slave label to schedule this job on. All slaves have Ubuntu1604 no matter what distro target nodes use'
- string:
name: PROVISIONER_TYPE
@@
-338,7
+346,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