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 "Add pike combo to carbon and nitrogen jobs"
[releng/builder.git]
/
jjb
/
genius
/
genius-csit-genius.yaml
diff --git
a/jjb/genius/genius-csit-genius.yaml
b/jjb/genius/genius-csit-genius.yaml
index 75afd356c80be13931d1d5d4ae87d7beacb05077..614d8ab7c84cb98edab5c042cd2bb9a1023301a8 100644
(file)
--- a/
jjb/genius/genius-csit-genius.yaml
+++ b/
jjb/genius/genius-csit-genius.yaml
@@
-2,36
+2,47
@@
- project:
name: genius-csit-genius
jobs:
- project:
name: genius-csit-genius
jobs:
+ - '{project}-csit-3node-{functionality}-{install}-{stream}'
- '{project}-csit-1node-{functionality}-{install}-{stream}'
- '{project}-csit-verify-1node-{functionality}'
- '{project}-csit-1node-{functionality}-{install}-{stream}'
- '{project}-csit-verify-1node-{functionality}'
+ - '{project}-csit-verify-3node-{functionality}'
+
# The project name
project: 'genius'
# The functionality under test
# The project name
project: 'genius'
# The functionality under test
- functionality: 'genius'
+ functionality:
+ - 'upstream'
+ - 'gate'
# Project branches
stream:
# Project branches
stream:
- -
carbo
n:
+ -
oxyge
n:
branch: 'master'
jre: 'openjdk8'
branch: 'master'
jre: 'openjdk8'
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ jre: 'openjdk8'
+ - carbon:
+ branch: 'stable/carbon'
+ jre: 'openjdk8'
+ karaf-version: karaf3
- boron:
branch: 'stable/boron'
jre: 'openjdk8'
- boron:
branch: 'stable/boron'
jre: 'openjdk8'
+ karaf-version: karaf3
install:
install:
- - only:
- scope: 'only'
- all:
scope: 'all'
# Mininet configuration
- all:
scope: 'all'
# Mininet configuration
- tools_system_count:
2
- tools_system_image: Ubuntu 1
4.04 - mininet-ovs-25 - 20170210-0300
+ tools_system_count:
3
+ tools_system_image: Ubuntu 1
6.04 - mininet-ovs-25 - 20170808-0158
# Features to install
# Features to install
- install-features: 'odl-genius-
ui
'
+ install-features: 'odl-genius-
rest
'
# Robot custom options
robot-options: ' '
# Robot custom options
robot-options: ' '