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
/
neutron
/
neutron.yaml
diff --git
a/jjb/neutron/neutron.yaml
b/jjb/neutron/neutron.yaml
index db79a7ff3e5dc9a0960fc1675bcc1cb00f1ad6ae..3f3de316aeb5e33e23946ae2411fe65dda34206f 100644
(file)
--- a/
jjb/neutron/neutron.yaml
+++ b/
jjb/neutron/neutron.yaml
@@
-2,18
+2,16
@@
- project:
name: neutron-oxygen
jobs:
- project:
name: neutron-oxygen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-m
erge-{stream}
'
- -
'{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-m
aven-javadoc-jobs
'
+ -
odl-maven-jobs
stream: oxygen
project: 'neutron'
project-name: 'neutron'
stream: oxygen
project: 'neutron'
project-name: 'neutron'
- build-timeout:
6
0
+ build-timeout:
9
0
branch: 'master'
branch: 'master'
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-26,21
+24,22
@@
email-upstream: '[neutron] [odlparent] [aaa]'
archive-artifacts: ''
email-upstream: '[neutron] [odlparent] [aaa]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a67e1b40d7419
+
- project:
name: neutron-nitrogen
jobs:
- project:
name: neutron-nitrogen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-m
erge-{stream}
'
- -
'{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-m
aven-javadoc-jobs
'
+ -
odl-maven-jobs
stream: nitrogen
project: 'neutron'
project-name: 'neutron'
build-timeout: 60
branch: 'stable/nitrogen'
stream: nitrogen
project: 'neutron'
project-name: 'neutron'
build-timeout: 60
branch: 'stable/nitrogen'
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-53,14
+52,16
@@
email-upstream: '[neutron] [odlparent] [aaa]'
archive-artifacts: ''
email-upstream: '[neutron] [odlparent] [aaa]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a67e1b40d7419
+
- project:
name: neutron-carbon
jobs:
- project:
name: neutron-carbon
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- - '{project-name}-m
erge-{stream}
'
- -
'{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-m
aven-javadoc-jobs
'
+ -
odl-maven-jobs
stream: carbon
project: 'neutron'
stream: carbon
project: 'neutron'
@@
-68,7
+69,6
@@
build-timeout: 60
branch: 'stable/carbon'
karaf-version: karaf3
build-timeout: 60
branch: 'stable/carbon'
karaf-version: karaf3
- jdk: openjdk8
jdks:
- openjdk8
maven:
jdks:
- openjdk8
maven:
@@
-81,10
+81,13
@@
email-upstream: '[neutron] [odlparent] [aaa]'
archive-artifacts: ''
email-upstream: '[neutron] [odlparent] [aaa]'
archive-artifacts: ''
+ # Used by the release job
+ staging-profile-id: a67e1b40d7419
+
- project:
name: neutron-sonar
jobs:
- project:
name: neutron-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'neutron'
project-name: 'neutron'
branch: 'master'
project: 'neutron'
project-name: 'neutron'
branch: 'master'