summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvictor.gao <victor.gao@huawei.com>2017-08-10 16:23:15 +0800
committervictor.gao <victor.gao@huawei.com>2017-08-11 17:03:24 +0800
commitbf43fe6efb097953040bea466e5d1be02f06b937 (patch)
tree4b3c98db85e4a5069ae5f73ec7f0fd15b4a90906
parent78c0f343eccb0de0bf4ac14beb7997e3a7b5a998 (diff)
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>
-rw-r--r--jjb/vfc/vfc-nfvo-resmanagement.yaml5
1 files changed, 3 insertions, 2 deletions
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'