From: victor.gao <victor.gao@huawei.com>
Date: Thu, 10 Aug 2017 08:23:15 +0000 (+0800)
Subject: Add merge job for vfc/nfvo/resmanagement
X-Git-Tag: 1.0.0-Amsterdam~344^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F91%2F7091%2F6;p=ci-management.git

Add merge job for vfc/nfvo/resmanagement

VFC sub-project resmanagement missing merge jenkins job.

Change-Id: Ie4ad97966e6d2802600c3918670c68631fab844e
Issue-Id:CIMAN-18
Signed-off-by: victor.gao <victor.gao@huawei.com>
---

diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml
index e332a5a78..1f364da27 100644
--- a/jjb/vfc/vfc-nfvo-resmanagement.yaml
+++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml
@@ -2,14 +2,15 @@
 
 - project:
     name: vfc-nfvo-resmanagement
-    project-name: 'vfc-nfvo-resmanagement'
     project: 'vfc/nfvo/resmanagement'
+    project-name: 'vfc-nfvo-resmanagement'
+    mvn-settings: 'vfc-nfvo-resmanagement-settings'
     stream:
       - 'master':
           branch: 'master'
       - 'release-1.0.0':
           branch: 'release-1.0.0'
-    mvn-settings: 'vfc-nfvo-resmanagement-settings'
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
       - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'