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 "Do not specify jre or jdk if default value applies"
[releng/builder.git]
/
jjb
/
netconf
/
netconf-csit-callhome.yaml
diff --git
a/jjb/netconf/netconf-csit-callhome.yaml
b/jjb/netconf/netconf-csit-callhome.yaml
index 17beeaf95c3a7a4c4c1e8bf8b40022f758f812dd..1148ba026275b413200f318bd116827109c27885 100644
(file)
--- a/
jjb/netconf/netconf-csit-callhome.yaml
+++ b/
jjb/netconf/netconf-csit-callhome.yaml
@@
-16,13
+16,10
@@
stream:
- oxygen:
branch: 'master'
stream:
- oxygen:
branch: 'master'
- jre: 'openjdk8'
- nitrogen:
branch: 'stable/nitrogen'
- nitrogen:
branch: 'stable/nitrogen'
- jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jre: 'openjdk8'
karaf-version: karaf3
install:
karaf-version: karaf3
install:
@@
-30,7
+27,7
@@
scope: 'only'
# no mininet required
scope: 'only'
# no mininet required
- tools_system_image: Ubuntu 14.04 - gbp - 201708
08-0524
+ tools_system_image: Ubuntu 14.04 - gbp - 201708
23-0530
# Features to install
install-features: 'odl-netconf-callhome-ssh,odl-restconf'
# Features to install
install-features: 'odl-netconf-callhome-ssh,odl-restconf'