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
Switch the csit-1node to use job prefix
[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 e596eabe38dec217228cf9f1a5f2b7811e80f54f..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'
@@
-12,25
+12,15
@@
# Project branches
stream:
# Project branches
stream:
- -
nitro
gen:
+ -
oxy
gen:
branch: 'master'
branch: 'master'
- jre: 'openjdk8'
+ - 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'
@@
-39,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