From cd3bd4b18ca266f8ad4c86cb46a516b22e970089 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Mon, 15 Jan 2018 13:54:05 -0500 Subject: [PATCH] Switch dlux to using new gjjb maven-merge jobs Works around issue with javadoc and JAVA_HOME which Jenkins Maven project types do not appear to configure. Change-Id: Icb049d02d1da936ca559c4fe2f45d68324d03ee0 Signed-off-by: Thanh Ha --- jjb/dlux/dlux.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 435edcd5e..a6f6104f4 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -5,7 +5,7 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' + - gerrit-maven-merge stream: oxygen project: 'dlux' @@ -32,7 +32,7 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' + - gerrit-maven-merge stream: nitrogen project: 'dlux' @@ -59,7 +59,7 @@ - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - '{project-name}-maven-jobs' - - '{project-name}-merge-{stream}' + - gerrit-maven-merge stream: carbon project: 'dlux' -- 2.36.6