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
/
sxp
/
sxp-csit-basic.yaml
diff --git
a/jjb/sxp/sxp-csit-basic.yaml
b/jjb/sxp/sxp-csit-basic.yaml
index e184c6b646c22218f60372e60c926db615ce8334..5c91055cb92fea93b632ac069958545e52958eee 100644
(file)
--- a/
jjb/sxp/sxp-csit-basic.yaml
+++ b/
jjb/sxp/sxp-csit-basic.yaml
@@
-1,7
+1,8
@@
+---
- project:
name: sxp-csit-basic
jobs:
- project:
name: sxp-csit-basic
jobs:
- - '{project}-csit-1node-{functionality}-{install}-{stream}'
+ - inttest-csit-1node
# The project name
project: 'sxp'
# The project name
project: 'sxp'
@@
-11,30
+12,20
@@
# Project branches
stream:
# Project branches
stream:
- - carbon:
- branch: 'master'
- jre: 'openjdk8'
- - boron:
- branch: 'stable/boron'
- jre: 'openjdk8'
- - beryllium:
- branch: 'stable/beryllium'
- jre: 'openjdk7'
- - stable-lithium:
- branch: 'stable/lithium'
- 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
install-features: 'odl-restconf,odl-sxp-controller'
# Robot custom options
robot-options: ''
# Features to install
install-features: 'odl-restconf,odl-sxp-controller'
# Robot custom options
robot-options: ''
-
- # Trigger jobs (upstream dependencies)
- trigger-jobs: 'yangtools-distribution-{stream},controller-distribution-{stream},sxp-distribution-{stream},mdsal-distribution-{stream},netconf-distribution-{stream}'