Move projects to gerrit-maven-sonar

The current Sonar goal in release-version-java-daily
has a lot of issues when running for projects in more than
one branch.
Remove sonar task from release-version-java-daily and use
global-jjb gerrit-maven-sonar job instead.

Change-Id: I9a20b68f4539e227ceab4063edb2df429cf60afb
Issue-ID: CIMAN-126
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

1 files changed, 36 insertions, 25 deletions

diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index fb0f5046f..015a9fe9b 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -1,30 +1,41 @@
----

-

-- project:

-    name: vfc-nfvo-driver-ems-java

-    project-name: 'vfc-nfvo-driver-ems'

-    project: 'vfc/nfvo/driver/ems'

-    stream:

-      - 'master':

-          branch: 'master'

+---
+
+- project:
+    name: vfc-nfvo-driver-ems-java
+    project-name: 'vfc-nfvo-driver-ems'
+    project: 'vfc/nfvo/driver/ems'
+    stream:
+      - 'master':
+          branch: 'master'
       - 'amsterdam':
           branch: 'amsterdam'
-    mvn-settings: 'vfc-nfvo-driver-ems-settings'

-    subproject:

-      - 'drv-ems-boco':

-          pom: 'ems/pom.xml'

-          pattern: 'ems/**'

-    jobs:

+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
+    subproject:
+      - 'drv-ems-boco':
+          pom: 'ems/pom.xml'
+          pattern: 'ems/**'
+    jobs:
       - gerrit-maven-clm:
           java-version: ''
-      - '{project-name}-{stream}-{subproject}-verify-java'

-      - '{project-name}-{stream}-{subproject}-merge-java'

-      - '{project-name}-{stream}-release-version-java-daily'

-      - '{project-name}-{stream}-docker-java-version-shell-daily':

-          docker-pom: 'pom.xml'

-          mvn-goals: 'install'

-          script:

-            !include-raw-escape: 'build-driver-ems-docker-image.sh'

-    files: '**'

-    archive-artifacts: ''

+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-docker-java-version-shell-daily':
+          docker-pom: 'pom.xml'
+          mvn-goals: 'install'
+          script:
+            !include-raw-escape: 'build-driver-ems-docker-image.sh'
+    files: '**'
+    archive-artifacts: ''
     build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: vfc-nfvo-driver-ems-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'vfc/nfvo/driver/ems'
+    project-name: 'vfc-nfvo-driver-ems'
+    branch: 'master'
+    mvn-settings: 'vfc-nfvo-driver-ems-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file