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
Rework the way Java version is set in CSIT jobs
[releng/builder.git]
/
jjb
/
controller
/
controller-csit-clustering.yaml
diff --git
a/jjb/controller/controller-csit-clustering.yaml
b/jjb/controller/controller-csit-clustering.yaml
index 8b28b72a984421fbbdf4a123b277674fc1fc5ae0..79ce7e65ef62df566d251e10cc34f992d4115649 100644
(file)
--- a/
jjb/controller/controller-csit-clustering.yaml
+++ b/
jjb/controller/controller-csit-clustering.yaml
@@
-12,10
+12,12
@@
# Project branches
stream:
# Project branches
stream:
- - b
eryllium
:
+ - b
oron
:
branch: 'master'
branch: 'master'
- - stable-lithium:
- branch: 'stable/lithium'
+ jre: 'openjdk8'
+ - beryllium:
+ branch: 'stable/beryllium'
+ jre: 'openjdk7'
install:
- only:
install:
- only:
@@
-24,10
+26,16
@@
scope: 'all'
# Features to install
scope: 'all'
# Features to install
- install-features: 'odl-restconf,odl-clustering-test-app,odl-
netconf-connector-ssh
'
+ install-features: 'odl-restconf,odl-clustering-test-app,odl-
jolokia
'
# Robot custom options
robot-options: ''
# Trigger jobs (upstream dependencies)
# Robot custom options
robot-options: ''
# Trigger jobs (upstream dependencies)
- trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream}'
+ trigger-jobs: >
+ odlparent-distribution-{stream},
+ yangtools-distribution-{stream},
+ mdsal-distribution-{stream},
+ controller-distribution-{stream},
+ netconf-distribution-{stream},
+ integration-distribution-merge-{stream}