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 "Update Ansible playbooks to new names"
[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 0a0d61305d053431b688d56475275379f33e9553..54d9b5ccba9a50a2dc51b5b609c20b98e358bf36 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'
@@
-14,17
+14,12
@@
stream:
- oxygen:
branch: 'master'
stream:
- oxygen:
branch: 'master'
- jre: 'openjdk8'
- nitrogen:
branch: 'stable/nitrogen'
- nitrogen:
branch: 'stable/nitrogen'
- jre: 'openjdk8'
- carbon:
branch: 'stable/carbon'
- carbon:
branch: 'stable/carbon'
- jre: 'openjdk8'
karaf-version: karaf3
karaf-version: karaf3
- # TODO: Add Beryllium when everything is backported there.
-
install:
- all:
scope: 'all'
install:
- all:
scope: 'all'
@@
-34,6
+29,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