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 a6f6104f4c5aae5f987ab3bb45ee79fa1ee3c0d4..d090eebea62b27a5ef91ce80a2e98b48c44362d1 100644
(file)
--- a/
jjb/dlux/dlux.yaml
+++ b/
jjb/dlux/dlux.yaml
@@
-3,25
+3,16
@@
name: dlux-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
name: dlux-oxygen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - gerrit-maven-merge
+ - 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 -e'
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
# Used by the release job
staging-profile-id: 96e6a0327484f
@@
-30,25
+21,16
@@
name: dlux-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
name: dlux-nitrogen
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - gerrit-maven-merge
+ - 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
# Used by the release job
staging-profile-id: 96e6a0327484f
@@
-57,26
+39,17
@@
name: dlux-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
name: dlux-carbon
jobs:
- '{project-name}-distribution-check-{stream}'
- - '{project-name}-integration-{stream}'
- - '{project-name}-maven-jobs'
- - gerrit-maven-merge
+ - 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
# Used by the release job
staging-profile-id: 96e6a0327484f
@@
-89,5
+62,4
@@
project-name: 'dlux'
branch: 'master'
mvn-settings: 'dlux-settings'
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'