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
/
atrium
/
atrium.yaml
diff --git
a/jjb/atrium/atrium.yaml
b/jjb/atrium/atrium.yaml
index e6c1183545c35365e2872a834f7a7530e297e7a0..447d851608348231e9a0fed150fc77fdeeb2b4b7 100644
(file)
--- a/
jjb/atrium/atrium.yaml
+++ b/
jjb/atrium/atrium.yaml
@@
-3,25
+3,16
@@
name: atrium-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: atrium-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: oxygen
project: 'atrium'
project-name: 'atrium'
branch: 'master'
stream: oxygen
project: 'atrium'
project-name: 'atrium'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'atrium-settings'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 9324f12310e6a
# Used by the release job
staging-profile-id: 9324f12310e6a
@@
-30,25
+21,16
@@
name: atrium-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: atrium-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: nitrogen
project: 'atrium'
project-name: 'atrium'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'atrium'
project-name: 'atrium'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'atrium-settings'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 9324f12310e6a
# Used by the release job
staging-profile-id: 9324f12310e6a
@@
-57,26
+39,17
@@
name: atrium-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: atrium-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - '{project-name}-merge-{stream}'
+ - odl-maven-jobs
stream: carbon
project: 'atrium'
project-name: 'atrium'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'atrium'
project-name: 'atrium'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'atrium-settings'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: ''
email-upstream: '[atrium]'
- archive-artifacts: ''
# Used by the release job
staging-profile-id: 9324f12310e6a
# Used by the release job
staging-profile-id: 9324f12310e6a
@@
-84,10
+57,9
@@
- project:
name: atrium-sonar
jobs:
- project:
name: atrium-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'atrium'
project-name: 'atrium'
branch: 'master'
mvn-settings: 'atrium-settings'
project: 'atrium'
project-name: 'atrium'
branch: 'master'
mvn-settings: 'atrium-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'