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 "engine: Ignore releasenotes directory"
[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 cbda1d280821389ca80489814d5b85b2ee791e2f..5ea76f82b91e287df372a27031f0581488e3ccd4 100644
(file)
--- a/
jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
+++ b/
jjb/cloud-infra/cloud-infra-periodic-spinnaker.yaml
@@
-43,7
+43,7
@@
deploy-scenario-version: master
deploy-scenario-refspec: master
keypair-name: 'keypair-nordix-cicd-{deploy-scenario}-1_16'
deploy-scenario-version: master
deploy-scenario-refspec: master
keypair-name: 'keypair-nordix-cicd-{deploy-scenario}-1_16'
- disabled:
fals
e
+ disabled:
tru
e
delete-stack: 'yes'
distro:
delete-stack: 'yes'
distro:
@@
-156,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
@@
-342,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