Revert "Switch mdsal to using new maven-merge job"

This reverts commit 23f64b47684853e481bda28ae0f529144596c5b3.

The job does not correctly deploy all artifacts, leaving
yang-binding out for some reason.

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

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