Update merge job for dovetail-integration

also adding sonar

Issue-ID: VNFSDK-183

Change-Id: I016057e5603f3000348e1d0a714713e2056262b3
Signed-off-by: Chris Donley <christopher.donley@huawei.com>

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 55fcb9a..1e129ee 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -7,6 +7,7 @@
           path: '.'
           pattern: '**'
     project: 'vnfsdk/dovetail-integration'
+    pom: 'pom.xml'
     stream:
       - 'master':
           branch: 'master'
@@ -15,3 +16,16 @@
     jobs:
       - gerrit-maven-clm
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+- project:
+    name: vnfsdk-dovetail-integration-sonar
+    jobs:
+      - gerrit-maven-sonar
+    cron: 'H 11 * * *'
+    build-node: ubuntu1604-basebuild-4c-4g
+    project: 'vnfsdk/dovetail-integration'
+    project-name: 'vnfsdk-dovetail-integration'
+    branch: 'master'
+    mvn-settings: 'vnfsdk-dovetail-integration-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'