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 "Switch the csit-verify-1node to use job prefix"
[releng/builder.git]
/
jjb
/
neutron
/
neutron.yaml
diff --git
a/jjb/neutron/neutron.yaml
b/jjb/neutron/neutron.yaml
index 8d0548052fba702f9f9af7fb9fa414d24b05f033..3f3de316aeb5e33e23946ae2411fe65dda34206f 100644
(file)
--- a/
jjb/neutron/neutron.yaml
+++ b/
jjb/neutron/neutron.yaml
@@
-4,14
+4,13
@@
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}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
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'
jdks:
- openjdk8
branch: 'master'
jdks:
- openjdk8
@@
-33,9
+32,8
@@
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}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: nitrogen
project: 'neutron'
stream: nitrogen
project: 'neutron'
@@
-62,9
+60,8
@@
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}-maven-javadoc-jobs'
- '{project-name}-maven-javadoc-jobs'
- -
'{project-name}-merge-{stream}'
+ -
odl-maven-jobs
stream: carbon
project: 'neutron'
stream: carbon
project: 'neutron'
@@
-90,7
+87,7
@@
- 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'