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 "Adjust for karaf 4 not happening in carbon"
[releng/builder.git]
/
jjb
/
netconf
/
netconf-clustering.yaml
diff --git
a/jjb/netconf/netconf-clustering.yaml
b/jjb/netconf/netconf-clustering.yaml
index 7e04d5773c9e846f2db11d3524448a4b1a13676a..429f207e5c0bf742404901b0bbb74c2940ea571a 100644
(file)
--- a/
jjb/netconf/netconf-clustering.yaml
+++ b/
jjb/netconf/netconf-clustering.yaml
@@
-1,7
+1,8
@@
+---
- project:
name: netconf-csit-clustering
jobs:
- project:
name: netconf-csit-clustering
jobs:
-
- '{project}-csit-3node-{functionality}-{install}-{stream}'
+ - '{project}-csit-3node-{functionality}-{install}-{stream}'
# The project name
project: 'netconf'
# The project name
project: 'netconf'
@@
-11,22
+12,32
@@
# Project branches
stream:
# Project branches
stream:
- - boron:
- branch: 'master'
- - beryllium:
- branch: 'stable/beryllium'
+ - nitrogen:
+ branch: 'master'
+ jre: 'openjdk8'
+ - carbon:
+ branch: 'stable/carbon'
+ jre: 'openjdk8'
+ karaf-version: karaf3
+ - boron:
+ branch: 'stable/boron'
+ jre: 'openjdk8'
+ karaf-version: karaf3
+ - beryllium:
+ branch: 'stable/beryllium'
+ jre: 'openjdk7'
+ karaf-version: karaf3
install:
install:
-
- only:
-
scope: 'only'
-
- all:
-
scope: 'all'
+ - only:
+ scope: 'only'
+ - all:
+ scope: 'all'
# Features to install
# Features to install
- install-features: 'odl-restconf,odl-netconf-clustered-topology'
+ install-features: >
+ odl-restconf,
+ odl-netconf-clustered-topology
# Robot custom options
# Robot custom options
- robot-options: ''
-
- # Trigger jobs (upstream dependencies)
- trigger-jobs: 'odlparent-distribution-{stream},yangtools-distribution-{stream},controller-distribution-{stream},netconf-distribution-{stream},mdsal-distribution-{stream}'
+ robot-options: '-v USE_NETCONF_CONNECTOR:False'