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
/
tsdr
/
tsdr-csit-hsqldb.yaml
diff --git
a/jjb/tsdr/tsdr-csit-hsqldb.yaml
b/jjb/tsdr/tsdr-csit-hsqldb.yaml
index 63718986d3953ae42f279b9517c661176fa5cf56..6d4e1cbcd93795863720ae77e180e00b8357b5bd 100644
(file)
--- a/
jjb/tsdr/tsdr-csit-hsqldb.yaml
+++ b/
jjb/tsdr/tsdr-csit-hsqldb.yaml
@@
-1,8
+1,9
@@
+---
- project:
name: tsdr-csit-hsqldb
jobs:
- project:
name: tsdr-csit-hsqldb
jobs:
- - '{project}-csit-1node-{functionality}-{install}-{stream}'
- - '{project}-csit-verify-1node-{functionality}'
+ - inttest-csit-1node
+ - inttest-csit-verify-1node
# The project name
project: 'tsdr'
# The project name
project: 'tsdr'
@@
-12,27
+13,25
@@
# Project branches
stream:
# Project branches
stream:
- - carbon:
- branch: 'master'
- jre: 'openjdk8'
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
- - beryllium:
- branch: 'stable/beryllium'
- jre: 'openjdk7'
+ - oxygen:
+ branch: 'master'
+ - nitrogen:
+ branch: 'stable/nitrogen'
+ - carbon:
+ branch: 'stable/carbon'
+ karaf-version: karaf3
install:
install:
- - only:
- scope: 'only'
- - all:
- scope: 'all'
+ - all:
+ scope: 'all'
# Features to install
# Features to install
- install-features: 'odl-restconf,odl-tsdr-hsqldb,odl-tsdr-openflow-statistics-collector,odl-tsdr-netflow-statistics-collector,odl-tsdr-syslog-collector'
+ install-features: >
+ odl-restconf,
+ odl-tsdr-hsqldb,
+ odl-tsdr-openflow-statistics-collector,
+ odl-tsdr-netflow-statistics-collector,
+ odl-tsdr-syslog-collector
# Robot custom options
# Robot custom options
- robot-options: '-v ODL_VERSION:master'
-
- # Trigger jobs (upstream dependencies)
- trigger-jobs: 'openflowjava-distribution-{stream},openflowplugin-distribution-{stream},tsdr-distribution-{stream}'
+ robot-options: ''