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 "Fix for Pike/Queens 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 f89a2d4c63e97503e58873fc97a8ba79eaa3aa48..8f6aec788956909b5cfdde2caa4ee2bca6bb02ab 100644
(file)
--- a/
jjb/sxp/sxp-csit-cluster-routing.yaml
+++ b/
jjb/sxp/sxp-csit-cluster-routing.yaml
@@
-2,7
+2,7
@@
- project:
name: sxp-csit-routing
jobs:
- project:
name: sxp-csit-routing
jobs:
- -
'{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
+ -
inttest-csit-3node-periodic
# The project name
project: 'sxp'
# The project name
project: 'sxp'
@@
-12,25
+12,23
@@
# Project branches
stream:
# Project branches
stream:
- -
oxygen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
+ - oxygen:
+ branch: 'stable/oxygen'
- nitrogen:
branch: 'stable/nitrogen'
- nitrogen:
branch: 'stable/nitrogen'
- jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jre: 'openjdk8'
karaf-version: karaf3
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