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
/
dlux
/
dlux.yaml
diff --git
a/jjb/dlux/dlux.yaml
b/jjb/dlux/dlux.yaml
index 91dbc7e6002c55b636526a162ad1d1a1480ee21a..d090eebea62b27a5ef91ce80a2e98b48c44362d1 100644
(file)
--- a/
jjb/dlux/dlux.yaml
+++ b/
jjb/dlux/dlux.yaml
@@
-2,86
+2,64
@@
- project:
name: dlux-oxygen
jobs:
- project:
name: dlux-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}'
+ - odl-maven-jobs
stream: oxygen
project: 'dlux'
project-name: 'dlux'
branch: 'master'
stream: oxygen
project: 'dlux'
project-name: 'dlux'
branch: 'master'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
mvn-settings: 'dlux-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96e6a0327484f
- project:
name: dlux-nitrogen
jobs:
- project:
name: dlux-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}'
+ - odl-maven-jobs
stream: nitrogen
project: 'dlux'
project-name: 'dlux'
branch: 'stable/nitrogen'
stream: nitrogen
project: 'dlux'
project-name: 'dlux'
branch: 'stable/nitrogen'
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
mvn-settings: 'dlux-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96e6a0327484f
- project:
name: dlux-carbon
jobs:
- project:
name: dlux-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}'
+ - odl-maven-jobs
stream: carbon
project: 'dlux'
project-name: 'dlux'
branch: 'stable/carbon'
karaf-version: karaf3
stream: carbon
project: 'dlux'
project-name: 'dlux'
branch: 'stable/carbon'
karaf-version: karaf3
- jdks:
- - openjdk8
- maven:
- - mvn33:
- mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
mvn-settings: 'dlux-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
dependencies: 'odlparent-merge-{stream}'
email-upstream: '[dlux] [odlparent]'
- archive-artifacts: ''
+
+ # Used by the release job
+ staging-profile-id: 96e6a0327484f
- project:
name: dlux-sonar
jobs:
- project:
name: dlux-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'dlux'
project-name: 'dlux'
branch: 'master'
mvn-settings: 'dlux-settings'
project: 'dlux'
project-name: 'dlux'
branch: 'master'
mvn-settings: 'dlux-settings'
- mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'