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 "Remove jsonrpc carbon jobs"
[releng/builder.git]
/
jjb
/
aaa
/
aaa-csit-keystone.yaml
diff --git
a/jjb/aaa/aaa-csit-keystone.yaml
b/jjb/aaa/aaa-csit-keystone.yaml
index f23bf7909ed362a02223f70baaaa862b0ea4fd4e..8d0f33daf96e684b39b40b754d7cb623f05da58d 100644
(file)
--- a/
jjb/aaa/aaa-csit-keystone.yaml
+++ b/
jjb/aaa/aaa-csit-keystone.yaml
@@
-2,8
+2,8
@@
- project:
name: aaa-csit-keystone
jobs:
- project:
name: aaa-csit-keystone
jobs:
- -
'{project}-csit-1node-{functionality}-{install}-{stream}'
- -
'{project}-csit-verify-1node-{functionality}'
+ -
inttest-csit-1node
+ -
inttest-csit-verify-1node
# The project name
project: 'aaa'
# The project name
project: 'aaa'
@@
-13,13
+13,12
@@
# Project branches
stream:
# Project branches
stream:
- -
oxygen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
+ - oxygen:
+ branch: 'stable/oxygen'
- nitrogen:
branch: 'stable/nitrogen'
- nitrogen:
branch: 'stable/nitrogen'
- - carbon:
- branch: 'stable/carbon'
- karaf-version: karaf3
install:
- all:
install:
- all:
@@
-29,8
+28,8
@@
install-features: 'odl-restconf-all'
tools_system_count: '1'
install-features: 'odl-restconf-all'
tools_system_count: '1'
- tools_system_flavor: '
4 GB General Purpose v1
'
- tools_system_image: '
CentOS 7 - docker - 20171016-0023
'
+ tools_system_flavor: '
odl-highcpu-2
'
+ tools_system_image: '
ZZCI - CentOS 7 - docker - 20180417-0311
'
# Robot custom options
robot-options: ''
# Robot custom options
robot-options: ''