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
/
integration
/
distribution
/
distribution-csit-userfeatures.yaml
diff --git
a/jjb/integration/distribution/distribution-csit-userfeatures.yaml
b/jjb/integration/distribution/distribution-csit-userfeatures.yaml
index fa5d9de21ce5902d71d1fee7081a978ce7f90cab..0d016eb586774837c91bff98948100656e75cc59 100644
(file)
--- a/
jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/
jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@
-2,7
+2,7
@@
- project:
name: distribution-csit-userfeatures
jobs:
- project:
name: distribution-csit-userfeatures
jobs:
- -
'{project}-csit-1node-{functionality}-{install}-{stream}'
+ -
inttest-csit-1node
# The project name
project: 'distribution'
# The project name
project: 'distribution'
@@
-12,8
+12,10
@@
# Project branches
stream:
# Project branches
stream:
- -
oxygen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
+ - oxygen:
+ branch: 'stable/oxygen'
- nitrogen:
branch: 'stable/nitrogen'
- carbon:
- nitrogen:
branch: 'stable/nitrogen'
- carbon:
@@
-29,6
+31,3
@@
# Robot custom options
robot-options: '-v USE_NETCONF_CONNECTOR:False'
# Robot custom options
robot-options: '-v USE_NETCONF_CONNECTOR:False'
-
- # Controller configuration
- odl_system_flavor: 8 GB General Purpose v1