Code Review
/
releng
/
builder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Adding 2 mininet VMs to the test and fix installed feature name"
[releng/builder.git]
/
jjb
/
opflex
/
opflex-dependencies-rpm.yaml
diff --git
a/jjb/opflex/opflex-dependencies-rpm.yaml
b/jjb/opflex/opflex-dependencies-rpm.yaml
index 679050030ae1f58a0f6ab5cc0ac7e73e38cef048..fa278236357152a29a5ee4cdd6795f06e5c09d3a 100644
(file)
--- a/
jjb/opflex/opflex-dependencies-rpm.yaml
+++ b/
jjb/opflex/opflex-dependencies-rpm.yaml
@@
-5,11
+5,16
@@
- 'opflex-openvswitch_rpm-{stream}'
stream:
- 'opflex-openvswitch_rpm-{stream}'
stream:
- - b
eryllium
:
+ - b
oron
:
branch: 'master'
jdk: openjdk7
jdks:
- openjdk7
branch: 'master'
jdk: openjdk7
jdks:
- openjdk7
+ - beryllium:
+ branch: 'stable/beryllium'
+ jdk: openjdk7
+ jdks:
+ - openjdk7
project: 'opflex'
project: 'opflex'
@@
-57,7
+62,8
@@
builders:
- shell:
builders:
- shell:
- !include-raw-escape include-raw-opflex-dep_rpm-build.sh
+ !include-raw-escape:
+ - include-raw-opflex-dep_rpm-build.sh
publishers:
- email-notification:
publishers:
- email-notification:
@@
-92,7
+98,8
@@
builders:
- shell:
builders:
- shell:
- !include-raw-escape include-raw-ovs_rpm-build.sh
+ !include-raw-escape:
+ - include-raw-ovs_rpm-build.sh
publishers:
- email-notification:
publishers:
- email-notification: