X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fmerge.yaml;h=4f517a428fb169a4a27c052f9290b0578315c4e8;hb=c7a89f6cf1661d35133863f27f8b35c9a267960e;hp=d9ee40ff8c10f4cd5acaa5cc560ff3bf308f067b;hpb=f74851aa75dfa2922cedff57a1b75e80cf319403;p=releng%2Fbuilder.git

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index d9ee40ff8..4f517a428 100644
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -23,9 +23,9 @@
     parameters:
         - project-parameter:
             project: '{project}'
-        - gerrit-parameter:
+        - gerrit-parameters:
+            project: '{project}'
             branch: '{branch}'
-        - gerrit-refspec-parameter:
             refspec: 'refs/heads/{branch}'
 
     scm:
@@ -47,19 +47,20 @@
             branch: '{branch}'
 
     prebuilders:
-        - wipe-org-opendaylight-repo
         - jacoco-nojava-workaround
         - provide-maven-settings:
-            global-settings-file: '{odl-global-settings}'
-            settings-file: '{JENKINS_SETTINGS}'
+            global-settings-file: 'odl-global-settings'
+            settings-file: 'JENKINS_SETTINGS'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS -Djenkins -Dmerge -Dstream={stream}'
+        goals: 'MAVEN_GOALS -V -B -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{JENKINS_SETTINGS}'
-        global-settings: '{odl-global-settings}'
+        settings: 'JENKINS_SETTINGS'
+        settings-type: cfp
+        global-settings: 'odl-global-settings'
+        global-settings-type: cfp
         post-step-run-condition: UNSTABLE
 
     postbuilders:
@@ -78,19 +79,23 @@
             - maven-target:
                 maven-version: '{mvn33}'
                 pom: pom.xml
-                goals: 'site:deploy -Dstream={stream}'
+                goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{JENKINS_SETTINGS}'
-                global-settings: '{odl-global-settings}'
+                settings: 'JENKINS_SETTINGS'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
             - maven-target:
                 maven-version: '{mvn33}'
                 pom: deploy-site.xml
-                goals: 'site:deploy -Dstream={stream}'
+                goals: 'site:deploy -V -B -Dstream={stream}'
                 java-opts:
                     - '-Xmx2g'
-                settings: '{JENKINS_SETTINGS}'
-                global-settings: '{odl-global-settings}'
+                settings: 'JENKINS_SETTINGS'
+                settings-type: cfp
+                global-settings: 'odl-global-settings'
+                global-settings-type: cfp
 
     reporters:
         - findbugs
@@ -104,3 +109,5 @@
             unique-version: true
             deploy-unstable: false
         - jacoco-report
+        - archive-build:
+            maven-version: '{mvn33}'