From f8ff067d3bf14fa405da95cffa1752e721c2dfbe Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 11 Jan 2018 21:54:02 +0100 Subject: [PATCH] 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 --- jjb/mdsal/mdsal.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index 2b77926cc..4df31f8b7 100644 --- 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' -- 2.36.6