X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb-templates%2Fmerge.yaml;h=60339777e09b1bdc9a32c708991a60dd09189f19;hb=6fd63bb0a61c1b0ee4041ea91d0092a39ce027c8;hp=39dc2d68d8ef7238f4e6e517dc2f72a96aef40b2;hpb=58384a7ab9ed7c2c19ccf29f97e64e6ebb129485;p=releng%2Fbuilder.git

diff --git a/jjb-templates/merge.yaml b/jjb-templates/merge.yaml
index 39dc2d68d..60339777e 100644
--- a/jjb-templates/merge.yaml
+++ b/jjb-templates/merge.yaml
@@ -46,15 +46,46 @@
         - jacoco-nojava-workaround
         - provide-maven-settings:
             global-settings-file: '{odl-global-settings}'
-            settings-file: '{yangtools-settings}'
+            settings-file: '{JENKINS_SETTINGS}'
 
     maven:
         maven-name: '{mvn33}'
         root-pom: 'POM'
-        goals: 'MAVEN_GOALS -Dmerge'
+        goals: 'MAVEN_GOALS -Dmerge -Dstream={stream}'
         maven-opts: 'MAVEN_OPTS'
         settings: '{JENKINS_SETTINGS}'
         global-settings: '{odl-global-settings}'
+        post-step-run-condition: UNSTABLE
+
+    postbuilders:
+        - 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