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 "Increase ocata packer timeout from 60m to 75m"
[releng/builder.git]
/
jjb
/
ofextensions
/
circuitsw
/
circuitsw.yaml
diff --git
a/jjb/ofextensions/circuitsw/circuitsw.yaml
b/jjb/ofextensions/circuitsw/circuitsw.yaml
index 68b6c8c1aba36c37f02cea055bed449addb33194..66bfcae955ae94def68574b7a918a826500f8ae1 100644
(file)
--- a/
jjb/ofextensions/circuitsw/circuitsw.yaml
+++ b/
jjb/ofextensions/circuitsw/circuitsw.yaml
@@
-3,8
+3,7
@@
name: circuitsw-oxygen
jobs:
- '{project-name}-integration-{stream}'
name: circuitsw-oxygen
jobs:
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'ofextensions/circuitsw'
stream: oxygen
project: 'ofextensions/circuitsw'
@@
-29,8
+28,7
@@
name: circuitsw-nitrogen
jobs:
- '{project-name}-integration-{stream}'
name: circuitsw-nitrogen
jobs:
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'ofextensions/circuitsw'
stream: nitrogen
project: 'ofextensions/circuitsw'
@@
-55,8
+53,7
@@
name: circuitsw-carbon
jobs:
- '{project-name}-integration-{stream}'
name: circuitsw-carbon
jobs:
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'ofextensions/circuitsw'
stream: carbon
project: 'ofextensions/circuitsw'