Reapply Switch mdsal to using new maven-merge job

This reverts commit cfe8194b57be9fb0d3827b1be0e3f08ca433fd8d --
the fault was not with the job, but with the patch being merged.

Change-Id: Ie8e52d0a6b3505bca635bd7997fbaf388e278ab4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index 2b77926cc313b8ee64ca1784a0baba59087e4a32..4df31f8b7a79d31255de9d1bbb42687b63fbb96f 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.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: 'mdsal'
@@ -35,7 +35,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - gerrit-maven-merge
 
     stream: nitrogen
     project: 'mdsal'
@@ -63,7 +63,7 @@
       - '{project-name}-integration-{stream}'
       - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - gerrit-maven-merge
 
     stream: carbon
     project: 'mdsal'