From f8ca610f4ba86fe17fab00137beab7c64fa47097 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 16 Aug 2019 15:57:54 -0400 Subject: [PATCH] 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 --- jjb/releng-templates-java.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index fdd9d70a4..ac30afb8a 100644 --- 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 -- 2.36.6