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 2f134110d8b499629455a5f3415b6d32b3a162d3..0390c54b4c2c8aa1304a25b5f886911f6ba4eb02 100644 (file)
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -33,7 +33,8 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
         - gerrit-trigger-patch-merged:
@@ -46,7 +47,7 @@
     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}'