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
Remove {project}-integration-{stream} jobs
[releng/builder.git]
/
jjb
/
neutron
/
neutron.yaml
diff --git
a/jjb/neutron/neutron.yaml
b/jjb/neutron/neutron.yaml
index d2b300b981a52ff6c3619aef6da8a51ad3021371..9c1c89196138302b00d58a19600223b0c941408c 100644
(file)
--- a/
jjb/neutron/neutron.yaml
+++ b/
jjb/neutron/neutron.yaml
@@
-2,64
+2,49
@@
- project:
name: neutron-oxygen
jobs:
- project:
name: neutron-oxygen
jobs:
- - '{project-name}-clm-{stream}'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
- - gerrit-maven-verify-dependencies
+ - '{project-name}-maven-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'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'neutron-settings'
mvn-settings: 'neutron-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
email-upstream: '[neutron] [odlparent] [aaa]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
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}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-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'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'neutron-settings'
mvn-settings: 'neutron-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
email-upstream: '[neutron] [odlparent] [aaa]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
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}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-merge-{stream}'
- - '{project-name}-verify-{stream}-{maven}-{jdks}'
+ - '{project-name}-maven-javadoc-jobs'
+ - odl-maven-jobs
stream: carbon
project: 'neutron'
stream: carbon
project: 'neutron'
@@
-67,25
+52,20
@@
build-timeout: 60
branch: 'stable/carbon'
karaf-version: karaf3
build-timeout: 60
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'neutron-settings'
mvn-settings: 'neutron-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
email-upstream: '[neutron] [odlparent] [aaa]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
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'
mvn-settings: 'neutron-settings'
project: 'neutron'
project-name: 'neutron'
branch: 'master'
mvn-settings: 'neutron-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'