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 <thanh.ha@linuxfoundation.org>

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 435edcd5e3006c1614abba1bb21934b14fb02e42..a6f6104f4c5aae5f987ab3bb45ee79fa1ee3c0d4 100644 (file)
--- 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'