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 0ac92e7e4b9616a0ca17d4d399c84258b83b8fd6..0c2b0fdfd27b826f851b7e5fc7dcf5cf5c07c43c 100644
(file)
--- a/
jjb/controller/controller-csit-rest-cars-perf.yaml
+++ b/
jjb/controller/controller-csit-rest-cars-perf.yaml
@@
-1,7
+1,8
@@
+---
- 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'
@@
-11,27
+12,24
@@
# Project branches
stream:
# Project branches
stream:
-
- boron
:
-
branch: 'master'
- jre: 'openjdk8'
- - beryllium:
- branch: 'stable/beryllium'
-
jre: 'openjdk7
'
-
- stable-lithium
:
-
branch: 'stable/lithium
'
- jre: 'openjdk7'
+
- fluorine
:
+ branch: 'master'
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+
branch: 'stable/nitrogen
'
+
- carbon
:
+
branch: 'stable/carbon
'
+ karaf-version: karaf3
install:
install:
- - only:
- scope: 'only'
- - all:
- scope: 'all'
+ - all:
+ scope: 'all'
# Features to install
# 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: ''
-
- # Trigger jobs (upstream dependencies)
- trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},aaa-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'