From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Mon, 15 Jan 2018 19:10:22 +0000 (-0500)
Subject: Add maven-merge job to maven job group
X-Git-Tag: v0.15.0~8^2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=44360a16ab50eb23b777e7bace52efb7ad3edd7e;p=releng%2Fglobal-jjb.git

Add maven-merge job to maven job group

Tested this for a couple weeks now. Let's start deploying it
more broadly.

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

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 47c25556..92946503 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -10,6 +10,7 @@
     # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - gerrit-maven-clm
+      - gerrit-maven-merge
       - gerrit-maven-release
       - gerrit-maven-verify
       - gerrit-maven-verify-dependencies
@@ -23,6 +24,7 @@
     # TODO: Add Maven Merge job to this list once it's been fully tested.
     jobs:
       - github-maven-clm
+      - github-maven-merge
       - github-maven-release
       - github-maven-verify