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
Switch dlux to using new gjjb maven-merge jobs
[releng/builder.git]
/
jjb
/
dlux
/
dlux.yaml
diff --git
a/jjb/dlux/dlux.yaml
b/jjb/dlux/dlux.yaml
index 930a50c63a5a6ab02c69672fb3b9d523fba1b885..a6f6104f4c5aae5f987ab3bb45ee79fa1ee3c0d4 100644
(file)
--- a/
jjb/dlux/dlux.yaml
+++ b/
jjb/dlux/dlux.yaml
@@
-5,7
+5,7
@@
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- -
'{project-name}-merge-{stream}'
+ -
gerrit-maven-merge
stream: oxygen
project: 'dlux'
stream: oxygen
project: 'dlux'
@@
-17,7
+17,7
@@
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
- mvn33:
mvn-version: 'mvn33'
mvn-settings: 'dlux-settings'
- mvn-goals: 'clean install'
+ 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]'
@@
-32,7
+32,7
@@
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- -
'{project-name}-merge-{stream}'
+ -
gerrit-maven-merge
stream: nitrogen
project: 'dlux'
stream: nitrogen
project: 'dlux'
@@
-59,7
+59,7
@@
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- '{project-name}-distribution-check-{stream}'
- '{project-name}-integration-{stream}'
- '{project-name}-maven-jobs'
- -
'{project-name}-merge-{stream}'
+ -
gerrit-maven-merge
stream: carbon
project: 'dlux'
stream: carbon
project: 'dlux'
@@
-84,7
+84,7
@@
- project:
name: dlux-sonar
jobs:
- project:
name: dlux-sonar
jobs:
- -
'{project-name}-sonar'
+ -
gerrit-maven-sonar
project: 'dlux'
project-name: 'dlux'
branch: 'master'
project: 'dlux'
project-name: 'dlux'
branch: 'master'