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 "Change feature odl-genius-ui to odl-genius-rest"
[releng/builder.git]
/
jjb
/
openflowplugin
/
openflowplugin-csit-flow-services.yaml
diff --git
a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
index 45e0c6b3d9f5c64365e5bad3ee0dfb6430cb7765..caef3feeea37f7645a44e1998c4ab5b11b1f694f 100644
(file)
--- a/
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
+++ b/
jjb/openflowplugin/openflowplugin-csit-flow-services.yaml
@@
-14,12
+14,17
@@
# Project branches
stream:
# Project branches
stream:
- -
carbo
n:
+ -
nitroge
n:
branch: 'master'
jre: 'openjdk8'
branch: 'master'
jre: 'openjdk8'
+ - carbon:
+ branch: 'stable/carbon'
+ jre: 'openjdk8'
+ karaf-version: karaf3
- boron:
branch: 'stable/boron'
jre: 'openjdk8'
- boron:
branch: 'stable/boron'
jre: 'openjdk8'
+ karaf-version: karaf3
install:
- only:
install:
- only:
@@
-28,10
+33,10
@@
scope: 'all'
# Features to install
scope: 'all'
# Features to install
- install-features: 'odl-openflowplugin-flow-services-
ui
,odl-openflowplugin-app-table-miss-enforcer'
+ install-features: 'odl-openflowplugin-flow-services-
rest
,odl-openflowplugin-app-table-miss-enforcer'
# Robot custom options
robot-options: ''
# mininet image
# Robot custom options
robot-options: ''
# mininet image
- tools_system_image: Ubuntu 1
4.04 - mininet-ovs-25 - 20170210-0300
+ tools_system_image: Ubuntu 1
6.04 - mininet-ovs-25 - 20170609-0221