Add a standard merge job that can watch upstream

Make it possible to have a standard merge job that can also be triggered
by successful upstream jobs

Change-Id: Id4283456ab16f3ddc4c65b1441fee1e6dbf03211
Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org>

1 files changed, 62 insertions, 0 deletions

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 580df85b9..b88567f1d 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -366,6 +366,68 @@
 #           maven-version: 'mvn33'
 
 - job-template:
+    # Job template for Java merge jobs that should also be triggered by upstream
+    # merges
+    #
+    # Required Variables:
+    #   stream:         release stream
+    #   branch:         git branch
+    #   dependencies:   fully qualified upstream job name to trigger on
+    #                   this may be ''
+    name: '{project-name}-{stream}-downstream-merge-java'
+
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - ecomp-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - ecomp-infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - ecomp-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - reverse:
+          jobs: '{dependencies}'
+          result: 'success'
+      - gerrit-trigger-patch-merged:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - maven-target:
+          maven-version: 'mvn33'
+          # yamllint disable rule:line-length
+          goals: 'clean deploy'
+          # yamllint enable
+          settings: '{mvn-settings}'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+
+#     publishers:
+#       - ecomp-infra-shiplogs:
+#           maven-version: 'mvn33'
+
+- job-template:
     # Job template for Java merge jobs with POM not at the root
     #
     # The purpose of this job template is to run "maven clean deploy" for