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
Make Java version for CSIT jobs configurable
[releng/builder.git]
/
jjb
/
nic
/
nic-csit-basic.yaml
diff --git
a/jjb/nic/nic-csit-basic.yaml
b/jjb/nic/nic-csit-basic.yaml
index 8b90bae4977dc890d658be320dd6b02529c193ac..8443e1c8ddf9382fd31fc4bcd267948a9e044258 100644
(file)
--- a/
jjb/nic/nic-csit-basic.yaml
+++ b/
jjb/nic/nic-csit-basic.yaml
@@
-1,8
+1,8
@@
- project:
name: nic-csit-basic
jobs:
- project:
name: nic-csit-basic
jobs:
- - '{project}-csit-1node-
cds-
{functionality}-{install}-{stream}'
- - '{project}-csit-verify-
{functionality}-{stream
}'
+ - '{project}-csit-1node-{functionality}-{install}-{stream}'
+ - '{project}-csit-verify-
1node-{functionality
}'
# The project name
project: 'nic'
# The project name
project: 'nic'
@@
-12,10
+12,15
@@
# Project branches
stream:
# Project branches
stream:
- -
master
:
+ -
boron
:
branch: 'master'
branch: 'master'
+ jdk: 'openjdk8'
+ - beryllium:
+ branch: 'stable/beryllium'
+ jdk: 'openjdk7'
- stable-lithium:
branch: 'stable/lithium'
- stable-lithium:
branch: 'stable/lithium'
+ jdk: 'openjdk7'
install:
- only:
install:
- only:
@@
-23,12
+28,8
@@
- all:
scope: 'all'
- all:
scope: 'all'
- # Mininet configuration
- mininet-image: 'rk-c-el6-mininet'
- mininet-vms: 1
-
# Features to install
# Features to install
- install-features: 'odl-nic-core
,odl-nic-console,odl-nic-renderer-vtn,odl-nic-renderer-gbp
'
+ install-features: 'odl-nic-core
-service-mdsal,odl-nic-console
'
# Robot custom options
robot-options: ''
# Robot custom options
robot-options: ''