summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Grimberg <agrimberg@linuxfoundation.org>2017-08-11 17:12:11 +0000
committerGerrit Code Review <gerrit@onap.org>2017-08-11 17:12:11 +0000
commitce77ac914e9d18f4666541cda212cc1c642b0d8b (patch)
treebc99379e6d4b303dc2d2cd26ec3bcbaef24e3749
parent31afc5c3db509379b00c046c490e1b7022c7d7ce (diff)
parentbf43fe6efb097953040bea466e5d1be02f06b937 (diff)
Merge "Add merge job for vfc/nfvo/resmanagement"
-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'