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 61e6c563fc212ab331ad72cc48389a37f0b7461b..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,19
+12,14
@@
# 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
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
karaf-version: karaf3
install:
karaf-version: karaf3
install: