Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
JJB 2.0.X does not allow scenario to be passed here
[releng.git]
/
jjb
/
compass4nfv
/
compass-ci-jobs.yml
diff --git
a/jjb/compass4nfv/compass-ci-jobs.yml
b/jjb/compass4nfv/compass-ci-jobs.yml
index
88fb026
..
8eeaabf
100644
(file)
--- a/
jjb/compass4nfv/compass-ci-jobs.yml
+++ b/
jjb/compass4nfv/compass-ci-jobs.yml
@@
-162,8
+162,6
@@
block-level: 'NODE'
wrappers:
block-level: 'NODE'
wrappers:
- - build-name:
- name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
- fix-workspace-permissions
parameters:
- fix-workspace-permissions
parameters:
@@
-174,7
+172,6
@@
installer: '{installer}'
gs-pathname: '{gs-pathname}'
ppa-pathname: '{ppa-pathname}'
installer: '{installer}'
gs-pathname: '{gs-pathname}'
ppa-pathname: '{ppa-pathname}'
- scenario: '{scenario}'
- '{slave-label}-defaults'
- '{installer}-defaults'
- '{slave-label}-defaults'
- '{installer}-defaults'
@@
-362,7
+359,6
@@
installer: '{installer}'
gs-pathname: '{gs-pathname}'
ppa-pathname: '{ppa-pathname}'
installer: '{installer}'
gs-pathname: '{gs-pathname}'
ppa-pathname: '{ppa-pathname}'
- scenario: '{scenario}'
- '{slave-label}-defaults'
- '{installer}-defaults'
- '{slave-label}-defaults'
- '{installer}-defaults'
@@
-409,10
+405,10
@@
installer: '{installer}'
gs-pathname: '{gs-pathname}'
ppa-pathname: '{ppa-pathname}'
installer: '{installer}'
gs-pathname: '{gs-pathname}'
ppa-pathname: '{ppa-pathname}'
- scenario: '{scenario}'
- '{slave-label}-defaults'
- '{installer}-defaults'
- '{slave-label}-defaults'
- '{installer}-defaults'
+
scm:
- git-scm
scm:
- git-scm
@@
-457,7
+453,7
@@
description: "Directory where the logs will be located upon the completion of the collection."
- string:
name: DEPLOY_SCENARIO
description: "Directory where the logs will be located upon the completion of the collection."
- string:
name: DEPLOY_SCENARIO
- default: '
{scenario}
'
+ default: '
os-nosdn-nofeature-ha
'
description: "Scenario to deploy with."
- string:
name: COMPASS_OS_VERSION
description: "Scenario to deploy with."
- string:
name: COMPASS_OS_VERSION