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
/
next
/
next.yaml
diff --git
a/jjb/next/next.yaml
b/jjb/next/next.yaml
index e31e11ac8e8f87ee9fd9913948021868eac21d65..36c1d21e9fe2fa84b043052d120f0015ca00be81 100644
(file)
--- a/
jjb/next/next.yaml
+++ b/
jjb/next/next.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: 'next'
stream: oxygen
project: 'next'
@@
-31,8
+30,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: 'next'
stream: nitrogen
project: 'next'
@@
-58,8
+56,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: 'next'
stream: carbon
project: 'next'
@@
-84,7
+81,7
@@
- project:
name: next-sonar
jobs:
- project:
name: next-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'next'
project-name: 'next'
branch: 'master'
project: 'next'
project-name: 'next'
branch: 'master'