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-userfeatures.yaml
diff --git
a/jjb/netconf/netconf-userfeatures.yaml
b/jjb/netconf/netconf-userfeatures.yaml
index 54a9ec27ac6ca03dcde75409089793517b8d76c5..2b4c903d40e5019eb9b80635e5cfd8c8a602381c 100644
(file)
--- a/
jjb/netconf/netconf-userfeatures.yaml
+++ b/
jjb/netconf/netconf-userfeatures.yaml
@@
-19,12
+19,15
@@
- carbon:
branch: 'stable/carbon'
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-features: >
odl-restconf,
odl-netconf-mdsal,
install-features: >
odl-restconf,
odl-netconf-mdsal,
+ odl-mdsal-apidocs,
odl-clustering-test-app,
odl-netconf-connector-all,
odl-netconf-topology
odl-clustering-test-app,
odl-netconf-connector-all,
odl-netconf-topology
@@
-32,9
+35,11
@@
- beryllium:
branch: 'stable/beryllium'
jre: 'openjdk7'
- beryllium:
branch: 'stable/beryllium'
jre: 'openjdk7'
+ karaf-version: karaf3
install-features: >
odl-restconf,
odl-netconf-mdsal,
install-features: >
odl-restconf,
odl-netconf-mdsal,
+ odl-mdsal-apidocs,
odl-clustering-test-app,
odl-netconf-connector-all,
odl-netconf-topology
odl-clustering-test-app,
odl-netconf-connector-all,
odl-netconf-topology
@@
-50,6
+55,7
@@
install-features: >
odl-restconf,
odl-netconf-mdsal,
install-features: >
odl-restconf,
odl-netconf-mdsal,
+ odl-mdsal-apidocs,
odl-clustering-test-app,
odl-netconf-topology
odl-clustering-test-app,
odl-netconf-topology