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
/
controller
/
controller-csit-rest-cars-perf.yaml
diff --git
a/jjb/controller/controller-csit-rest-cars-perf.yaml
b/jjb/controller/controller-csit-rest-cars-perf.yaml
index 96d3eceecb1192f27390345994d01e4d1d907b8e..0c2b0fdfd27b826f851b7e5fc7dcf5cf5c07c43c 100644
(file)
--- a/
jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/
jjb/controller/controller-csit-rest-cars-perf.yaml
@@
-2,7
+2,7
@@
- project:
name: controller-csit-rest-cars-perf
jobs:
- project:
name: controller-csit-rest-cars-perf
jobs:
- -
'{project}-csit-1node-{functionality}-{install}-{stream}'
+ -
inttest-csit-1node
# The project name
project: 'controller'
# The project name
project: 'controller'
@@
-12,24
+12,24
@@
# Project branches
stream:
# Project branches
stream:
- -
carbon
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
- - boron:
- branch: 'stable/boron'
-
jre: 'openjdk8
'
- -
beryllium
:
- branch: 'stable/
beryllium
'
- jre: 'openjdk7'
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+
branch: 'stable/nitrogen
'
+ -
carbon
:
+ branch: 'stable/
carbon
'
+ karaf-version: karaf3
install:
install:
- - only:
- scope: 'only'
- all:
scope: 'all'
# Features to install
- all:
scope: 'all'
# Features to install
- install-features: 'odl-restconf,odl-clustering-test-app'
+ install-features: >
+ odl-restconf,
+ odl-clustering-test-app
# Robot custom options
robot-options: ''
# Robot custom options
robot-options: ''