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 "Rename onap-oom-nofeature scenario to onap-nofeature-noha"
[infra/cicd.git]
/
jjb
/
cloud-infra
/
onap-macros.yaml
diff --git
a/jjb/cloud-infra/onap-macros.yaml
b/jjb/cloud-infra/onap-macros.yaml
index 9ff14254695b9bb75cd37521d08b9f3f9be30935..42f7bc0e9e3127d14f0bdaee1b407f7b54a420b3 100644
(file)
--- a/
jjb/cloud-infra/onap-macros.yaml
+++ b/
jjb/cloud-infra/onap-macros.yaml
@@
-22,10
+22,6
@@
- parameter:
name: 'onap-parameter-macro'
parameters:
- parameter:
name: 'onap-parameter-macro'
parameters:
- - project-parameters:
- project: '{project}'
- branch: '{nordix-branch}'
- - nordix-gerrit-parameters
- label:
name: SLAVE_LABEL
default: 'jumphost-onap-ubuntu1804'
- label:
name: SLAVE_LABEL
default: 'jumphost-onap-ubuntu1804'
@@
-44,7
+40,7
@@
description: 'Installer to use for deploying the scenario'
- string:
name: DEPLOY_SCENARIO
description: 'Installer to use for deploying the scenario'
- string:
name: DEPLOY_SCENARIO
- default: 'onap-
oom-nofeature
'
+ default: 'onap-
nofeature-noha
'
description: 'Scenario to deploy and test'
- string:
name: DEPLOY_TYPE
description: 'Scenario to deploy and test'
- string:
name: DEPLOY_TYPE
@@
-100,10
+96,4
@@
- shell:
!include-raw: ./promote-onap.sh
- shell:
!include-raw: ./promote-onap.sh
-- builder:
- name: 'delete-stack-macro'
- builders:
- - shell:
- !include-raw: ./delete-stack.sh
-
# vim: set ts=2 sw=2 expandtab:
# vim: set ts=2 sw=2 expandtab: