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 "Adjust for karaf 4 not happening in carbon"
[releng/builder.git]
/
jjb
/
netconf
/
netconf-clustering.yaml
diff --git
a/jjb/netconf/netconf-clustering.yaml
b/jjb/netconf/netconf-clustering.yaml
index 5432a6e9b8405df5468ade193811b50e171b11e8..429f207e5c0bf742404901b0bbb74c2940ea571a 100644
(file)
--- a/
jjb/netconf/netconf-clustering.yaml
+++ b/
jjb/netconf/netconf-clustering.yaml
@@
-12,15
+12,21
@@
# 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
- beryllium:
branch: 'stable/beryllium'
jre: 'openjdk7'
- beryllium:
branch: 'stable/beryllium'
jre: 'openjdk7'
+ karaf-version: karaf3
install:
- only:
install:
- only:
@@
-29,7
+35,9
@@
scope: 'all'
# Features to install
scope: 'all'
# Features to install
- install-features: 'odl-restconf,odl-netconf-clustered-topology'
+ install-features: >
+ odl-restconf,
+ odl-netconf-clustered-topology
# Robot custom options
robot-options: '-v USE_NETCONF_CONNECTOR:False'
# Robot custom options
robot-options: '-v USE_NETCONF_CONNECTOR:False'