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
/
l2switch
/
l2switch.yaml
diff --git
a/jjb/l2switch/l2switch.yaml
b/jjb/l2switch/l2switch.yaml
index 147264acd62b3da6459ccc7602a17c3c5bc38f06..f203d89595c71d0d66c102419fe58cad0e222e52 100644
(file)
--- a/
jjb/l2switch/l2switch.yaml
+++ b/
jjb/l2switch/l2switch.yaml
@@
-4,8
+4,7
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'l2switch'
stream: oxygen
project: 'l2switch'
@@
-36,8
+35,7
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'l2switch'
stream: nitrogen
project: 'l2switch'
@@
-68,8
+66,7
@@
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
jobs:
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'l2switch'
stream: carbon
project: 'l2switch'
@@
-99,7
+96,7
@@
- project:
name: l2switch-sonar
jobs:
- project:
name: l2switch-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'
project: 'l2switch'
project-name: 'l2switch'
branch: 'master'