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

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 5258acc93..d9ee40ff8 100644
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -1,5 +1,5 @@
 - job-template:
-    name: 'PROJECT-merge-{stream}'
+    name: 'PROJECT_SHORTNAME-merge-{stream}'
 
     # Job template for ODL merge jobs
     #
@@ -7,22 +7,26 @@
     # and deploy artifacts to Nexus.
     #
     # Required Variables:
-    #     stream:    branch with - in place of / (eg. stable-helium)
-    #     branch:    branch (eg. stable/helium)
+    #     stream:    release stream (eg. stable-lithium or beryllium)
+    #     branch:    git branch (eg. stable/lithium or master)
 
     project-type: maven
     node: dynamic_merge
     jdk: '{jdk}'
 
     logrotate:
-        daysToKeep: '{build-days-to-keep}'
-        numToKeep: '{build-num-to-keep}'
+        daysToKeep: '14'
+        numToKeep: '10'
         artifactDaysToKeep: '{build-artifact-days-to-keep}'
         artifactNumToKeep: '{build-artifact-num-to-keep}'
 
     parameters:
         - project-parameter:
             project: '{project}'
+        - gerrit-parameter:
+            branch: '{branch}'
+        - gerrit-refspec-parameter:
+            refspec: 'refs/heads/{branch}'
 
     scm:
         - gerrit-trigger-scm:
@@ -33,31 +37,68 @@
     wrappers:
         - build-timeout
         - ssh-agent-credentials:
-            user: '{ssh-credentials}'
+            users:
+                - '{ssh-credentials}'
 
     triggers:
+        - timed: 'H H * * 0'
         - gerrit-trigger-patch-merged:
-            name: 'PROJECT'
+            name: 'PROJECT_PATH'
             branch: '{branch}'
 
     prebuilders:
         - wipe-org-opendaylight-repo
+        - jacoco-nojava-workaround
+        - provide-maven-settings:
+            global-settings-file: '{odl-global-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
-        maven-name: '{mvn32}'
+        maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS source:jar javadoc:jar'
+        goals: 'MAVEN_GOALS -Djenkins -Dmerge -Dstream={stream}'
         maven-opts: 'MAVEN_OPTS'
-        settings: '{PROJECT-settings}'
+        settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
+        post-step-run-condition: UNSTABLE
 
     postbuilders:
-        - jacoco-nojava-workaround
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: deploy-site.xml
+            condition-basedir: workspace
+
+            # The strategy here is intentional to run Maven site:deploy twice
+            # once using regular pom.xml to produce a staged-site which is
+            # then used by deploy-site.xml to push to Nexus. This is a
+            # workaround to Maven Site's default linking code which creates
+            # incorrect URLs for sites due to auto-detection assuming your
+            # project is configured in a certain way which ODL is not.
+            steps:
+            - maven-target:
+                maven-version: '{mvn33}'
+                pom: pom.xml
+                goals: 'site:deploy -Dstream={stream}'
+                java-opts:
+                    - '-Xmx2g'
+                settings: '{JENKINS_SETTINGS}'
+                global-settings: '{odl-global-settings}'
+            - maven-target:
+                maven-version: '{mvn33}'
+                pom: deploy-site.xml
+                goals: 'site:deploy -Dstream={stream}'
+                java-opts:
+                    - '-Xmx2g'
+                settings: '{JENKINS_SETTINGS}'
+                global-settings: '{odl-global-settings}'
+
+    reporters:
+        - findbugs
 
     publishers:
         ARCHIVE_ARTIFACTS
         - email-notification:
-            email-prefix: '[PROJECT]'
+            email-prefix: '[PROJECT_SHORTNAME]'
         - maven-deploy:
             id: ''
             unique-version: true