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 "Switch global-jjb jobs to use mvn35"
[releng/builder.git]
/
jjb
/
sxp
/
sxp-csit-topology.yaml
diff --git
a/jjb/sxp/sxp-csit-topology.yaml
b/jjb/sxp/sxp-csit-topology.yaml
index 5b6d6fc987f1d75e0dd344c20f8513f17afe76c2..3db08c4126a0692f33dd874ecb23c43d1ffcd9c4 100644
(file)
--- a/
jjb/sxp/sxp-csit-topology.yaml
+++ b/
jjb/sxp/sxp-csit-topology.yaml
@@
-1,7
+1,8
@@
+---
- project:
name: sxp-csit-topology
jobs:
- project:
name: sxp-csit-topology
jobs:
- - '{project}-csit-1node-{functionality}-{install}-{stream}'
+ - inttest-csit-1node
# The project name
project: 'sxp'
# The project name
project: 'sxp'
@@
-11,21
+12,17
@@
# Project branches
stream:
# Project branches
stream:
- - carbon:
- branch: 'master'
- jre: 'openjdk8'
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
- - beryllium:
- branch: 'stable/beryllium'
- jre: 'openjdk7'
+ - fluorine:
+ branch: 'master'
+ trigger-jobs: '{project}-merge-{stream}'
+ # yamllint disable-line rule:line-length
+ repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
+ - oxygen:
+ branch: 'stable/oxygen'
install:
install:
- - only:
- scope: 'only'
- - all:
- scope: 'all'
+ - all:
+ scope: 'all'
# Features to install
install-features: 'odl-restconf,odl-sxp-controller'
# Features to install
install-features: 'odl-restconf,odl-sxp-controller'