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 "Fix for Pike/Queens Jobs"
[releng/builder.git]
/
jjb
/
didm
/
didm-csit-discovery.yaml
diff --git
a/jjb/didm/didm-csit-discovery.yaml
b/jjb/didm/didm-csit-discovery.yaml
index cdcecae527c3cdd527b442dd9fe78d5558962231..4732b9b1c3c5a6ab432e61f47ec8faccd0d66033 100644
(file)
--- a/
jjb/didm/didm-csit-discovery.yaml
+++ b/
jjb/didm/didm-csit-discovery.yaml
@@
-1,8
+1,9
@@
+---
- project:
name: didm-csit-discovery
jobs:
- project:
name: didm-csit-discovery
jobs:
- - '{project}-csit-1node-{functionality}-{install}-{stream}'
- - '{project}-csit-verify-1node-{functionality}'
+ - inttest-csit-1node
+ - inttest-csit-verify-1node
# The project name
project: 'didm'
# The project name
project: 'didm'
@@
-12,25
+13,22
@@
# Project branches
stream:
# Project branches
stream:
-
- boron
:
-
branch: 'master'
- jre: 'openjdk8'
- - beryllium:
- branch: 'stable/beryllium'
-
jre: 'openjdk7
'
-
- stable-lithium
:
-
branch: 'stable/lithium
'
- jre: 'openjdk7'
+
- fluorine
:
+ branch: 'master'
+ - oxygen:
+ branch: 'stable/oxygen'
+ - nitrogen:
+
branch: 'stable/nitrogen
'
+
- carbon
:
+
branch: 'stable/carbon
'
+ karaf-version: karaf3
install:
install:
-
- only:
-
scope: 'only'
+ - only:
+ scope: 'only'
# Features to install
# Features to install
- install-features: 'odl-didm-all'
+ install-features: 'odl-
restconf,odl-
didm-all'
# Robot custom options
robot-options: ''
# Robot custom options
robot-options: ''
-
- # Trigger jobs (upstream dependencies)
- trigger-jobs: 'didm-distribution-{stream},openflowplugin-distribution-{stream}'