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 "Add pike combo to carbon and nitrogen jobs"
[releng/builder.git]
/
jjb
/
sxp
/
sxp-csit-cluster-routing.yaml
diff --git
a/jjb/sxp/sxp-csit-cluster-routing.yaml
b/jjb/sxp/sxp-csit-cluster-routing.yaml
index c32e756e87b9248b0086e4f0fe47713a726254fc..9f999fc8ee08cd4b7211e2267047298c33008d5e 100644
(file)
--- a/
jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/
jjb/sxp/sxp-csit-cluster-routing.yaml
@@
-12,18
+12,24
@@
# Project branches
stream:
# Project branches
stream:
- -
carbo
n:
+ -
oxyge
n:
branch: 'master'
jre: 'openjdk8'
branch: 'master'
jre: 'openjdk8'
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ jre: 'openjdk8'
+ - carbon:
+ branch: 'stable/carbon'
+ jre: 'openjdk8'
+ karaf-version: karaf3
+ install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route'
install:
install:
- - only:
- scope: 'only'
- all:
scope: 'all'
# Features to install
- all:
scope: 'all'
# Features to install
- install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-rout
e
'
+ install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-rout
ing
'
# Tools VMs:
tools_system_count: 2
# Tools VMs:
tools_system_count: 2