From b0e72cde3f152280c58f83fb81e53384ae70c2ec Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 29 Jan 2018 16:07:22 -0800
Subject: 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>
---
 jjb/dcaegen2/apod-analytics.yaml | 65 +++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 27 deletions(-)

(limited to 'jjb/dcaegen2/apod-analytics.yaml')

diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
index 4e6f2f3c6..99c68dcf3 100644
--- a/jjb/dcaegen2/apod-analytics.yaml
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -1,27 +1,38 @@
----
-- project:
-    name: dcaegen2-analytics-tca
-
-    # job template iterators
-    project-name: 'dcaegen2-analytics-tca'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'amsterdam':
-          branch: 'amsterdam'
-
-    # apply to all jobs
-    project: 'dcaegen2/analytics/tca'
-    mvn-settings: 'dcaegen2-analytics-tca-settings'
-    files: '**'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    archive-artifacts: ''
-    build-node: ubuntu1604-basebuild-4c-4g
-
-    jobs:
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-verify-java-skip-tests':
-          mvn-goals: 'clean install'
-      - '{project-name}-{stream}-merge-java':
-          mvn-goals: 'clean deploy'
+---
+- project:
+    name: dcaegen2-analytics-tca
+
+    # job template iterators
+    project-name: 'dcaegen2-analytics-tca'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'amsterdam':
+          branch: 'amsterdam'
+
+    # apply to all jobs
+    project: 'dcaegen2/analytics/tca'
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
+    files: '**'
+    maven-deploy-properties: |
+      deployAtEnd=true
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+
+    jobs:
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-verify-java-skip-tests':
+          mvn-goals: 'clean install'
+      - '{project-name}-{stream}-merge-java':
+          mvn-goals: 'clean deploy'
+- project:
+    name: dcaegen2-analytics-tca-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dcaegen2/analytics/tca'
+    project-name: 'dcaegen2-analytics-tca'
+    branch: 'master'
+    mvn-settings: 'dcaegen2-analytics-tca-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
-- 
cgit 1.2.3-korg