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
Merge "Improve script to use $WORKSPACE"
[releng/builder.git]
/
jjb-templates
/
merge.yaml
diff --git
a/jjb-templates/merge.yaml
b/jjb-templates/merge.yaml
index 5258acc9338c84b1a194e9e662c482a8d0090e90..0390c54b4c2c8aa1304a25b5f886911f6ba4eb02 100644
(file)
--- a/
jjb-templates/merge.yaml
+++ b/
jjb-templates/merge.yaml
@@
-33,7
+33,8
@@
wrappers:
- build-timeout
- ssh-agent-credentials:
wrappers:
- build-timeout
- ssh-agent-credentials:
- user: '{ssh-credentials}'
+ users:
+ - '{ssh-credentials}'
triggers:
- gerrit-trigger-patch-merged:
triggers:
- gerrit-trigger-patch-merged:
@@
-46,7
+47,7
@@
maven:
maven-name: '{mvn32}'
root-pom: 'POM'
maven:
maven-name: '{mvn32}'
root-pom: 'POM'
- goals: 'MAVEN_GOALS source:jar javadoc:jar'
+ goals: 'MAVEN_GOALS source:jar javadoc:jar
-Dmerge
'
maven-opts: 'MAVEN_OPTS'
settings: '{PROJECT-settings}'
global-settings: '{odl-global-settings}'
maven-opts: 'MAVEN_OPTS'
settings: '{PROJECT-settings}'
global-settings: '{odl-global-settings}'
@@
-54,6
+55,9
@@
postbuilders:
- jacoco-nojava-workaround
postbuilders:
- jacoco-nojava-workaround
+ reporters:
+ - findbugs
+
publishers:
ARCHIVE_ARTIFACTS
- email-notification:
publishers:
ARCHIVE_ARTIFACTS
- email-notification: