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 e9141edda8817dfd8d957585cb0527c92b6a07c8..0d016eb586774837c91bff98948100656e75cc59 100644
(file)
--- a/
jjb/integration/distribution/distribution-csit-userfeatures.yaml
+++ b/
jjb/integration/distribution/distribution-csit-userfeatures.yaml
@@
-2,8
+2,7
@@
- project:
name: distribution-csit-userfeatures
jobs:
- project:
name: distribution-csit-userfeatures
jobs:
- - '{project}-csit-1node-{functionality}-{install}-{stream}'
- - '{project}-csit4-1node-{functionality}-{install}-nitrogen'
+ - inttest-csit-1node
# The project name
project: 'distribution'
# The project name
project: 'distribution'
@@
-13,25
+12,17
@@
# Project branches
stream:
# Project branches
stream:
- -
nitrogen
:
+ -
fluorine
:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+ branch: 'stable/nitrogen'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jre: 'openjdk8'
- karaf-version: karaf3
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
karaf-version: karaf3
karaf-version: karaf3
- install-features: 'odl-restconf,odl-distribution-version,odl-netconf-connector-all,odl-jolokia'
- robot-options: '-v USE_NETCONF_CONNECTOR:True'
-
- # TODO: Add Beryllium when everything is backported there.
install:
install:
- - only:
- scope: 'only'
- all:
scope: 'all'
- all:
scope: 'all'
@@
-40,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