From f5b6f5cb5087243affed49c7f5278000d8ab0599 Mon Sep 17 00:00:00 2001
From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 6 Feb 2018 04:37:26 +0000
Subject: [PATCH] Revert "Remove unused maven merge job"

This reverts commit cf7459f328034a5fef43a0a29e6e8d7d63ed6d09.

Change-Id: I0565307cc6403cc6d33ba4c15f48dabfcff9227d
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---
 jjb/releng-templates-java.yaml | 107 +++++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index e8a9d82bd..9ae227a72 100644
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -74,3 +74,110 @@
       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-merge-{stream}'
+
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
+    project-type: maven
+    node: '{build-node}'
+    jdk: '{jdk}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: STREAM
+          default: '{stream}'
+          description: "String representing release name"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: 'H H * * 0'
+      - gerrit-trigger-patch-merged:
+          gerrit-server-name: '{gerrit-server-name}'
+          name: '{project}'
+          branch: '{branch}'
+
+    prebuilders:
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+    # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
+    maven:
+      maven-name: 'mvn33'
+      goals: >
+          {mvn-goals}
+          -Dmerge
+          -Dstream={stream}
+          {opendaylight-infra-mvn-opts}
+      maven-opts: '{mvn-opts}'
+      settings: '{mvn-settings}'
+      settings-type: cfp
+      global-settings: 'global-settings'
+      global-settings-type: cfp
+      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 -V -B -Dstream={stream}'
+                java-opts:
+                  - '-Xmx2g'
+                settings: '{mvn-settings}'
+                settings-type: cfp
+                global-settings: 'global-settings'
+                global-settings-type: cfp
+            - opendaylight-infra-deploy-maven-site:
+                settings-file: '{mvn-settings}'
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - lf-jacoco-report
+      - lf-infra-publish
+      - trigger:
+          project: 'distribution-merge-{stream}'
+          threshold: SUCCESS
-- 
2.36.6