Switch controller to using new maven-merge jobs

Change-Id: Id0b679add1aa12db2e75242b3d4b2b38774110c1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml
index 54c3a214f7d97a8e333dbf69ad9c3767f4a8bfc1..dc7bc56e31bcc1e8a8f36496c7f40934b1a5e7b3 100644 (file)
--- a/jjb/controller/controller.yaml
+++ b/jjb/controller/controller.yaml
@@ -6,7 +6,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - gerrit-maven-merge
 
     stream: oxygen
     project: 'controller'
@@ -34,7 +34,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - gerrit-maven-merge
 
     stream: nitrogen
     project: 'controller'
@@ -61,7 +61,7 @@
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - gerrit-maven-merge
 
     stream: carbon
     project: 'controller'