From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Tue, 9 Jan 2018 17:36:53 +0000 (-0500)
Subject: Switch controller to using new maven-merge jobs
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=c62aa5b177bc46852ed77dffe6de6d1d157a31af;p=releng%2Fbuilder.git

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 54c3a214f..dc7bc56e3 100644
--- 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'