Use global-jjb maven-merge for jdk11 group

Switch to using the global-jjb maven-merge job-template for the jdk11
job-group.

Change-Id: I3f6526725a436a677ef6f2da915cd99e7a8dd396
Signed-off-by: Thanh Ha <zxiiro@gmail.com>

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index fdd9d70a4dc091af2e4442514742e30f12e7ec82..ac30afb8a33dfb7342dfc6681e8b50ac984c6896 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -7,16 +7,8 @@
           nexus-iq-namespace: odl-
           nexus-iq-stage: release
 
-      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
-      # - gerrit-maven-merge:
-      #     post_build_trigger:
-      #       - project:
-      #           - 'distribution-merge-{stream}'
-      #         condition: SUCCESS
-      #         trigger-with-no-params: true
-      - '{project-name}-merge-{stream}':
+      - gerrit-maven-merge:
           build-timeout: 180
-          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
       - gerrit-maven-stage:
           sign-artifacts: true