Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
merge GIT_BRANCH and GERRIT_BRANCH into BRANCH
[releng.git]
/
jjb
/
storperf
/
storperf.yml
diff --git
a/jjb/storperf/storperf.yml
b/jjb/storperf/storperf.yml
index
d42540d
..
a04a9f4
100644
(file)
--- a/
jjb/storperf/storperf.yml
+++ b/
jjb/storperf/storperf.yml
@@
-13,10
+13,10
@@
branch: '{stream}'
gs-pathname: ''
disabled: false
branch: '{stream}'
gs-pathname: ''
disabled: false
- -
colorado
:
+ -
danube
:
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
branch: 'stable/{stream}'
gs-pathname: '/{stream}'
- disabled:
fals
e
+ disabled:
tru
e
- job-template:
name: 'storperf-verify-{stream}'
- job-template:
name: 'storperf-verify-{stream}'
@@
-28,7
+28,6
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
branch: '{branch}'
- string:
name: GIT_BASE
branch: '{branch}'
- string:
name: GIT_BASE
@@
-89,8
+88,7
@@
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
- - gerrit-parameter:
- branch: 'master'
+ branch: '{branch}'
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
- string:
name: GIT_BASE
default: https://gerrit.opnfv.org/gerrit/$PROJECT
@@
-144,13
+142,13
@@
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
# Required Variables:
# stream: branch with - in place of / (eg. stable)
# branch: branch (eg. stable)
- node: opnfv-build-ubuntu
-
- disabled: true
+ disabled: '{obj:disabled}'
parameters:
- project-parameter:
project: '{project}'
parameters:
- project-parameter:
project: '{project}'
+ branch: '{branch}'
+ - 'intel-pod9-defaults'
scm:
- git-scm
scm:
- git-scm