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/dmaap/dmaap-messagerouter-mirroragent.yaml | 49 ++++++++++++++++----------
 1 file changed, 30 insertions(+), 19 deletions(-)

(limited to 'jjb/dmaap/dmaap-messagerouter-mirroragent.yaml')

diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 89b942be8..abbb1fa63 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -1,23 +1,34 @@
----
-- project:
-    name: dmaap-messagerouter-mirroragent
-    project-name: 'dmaap-messagerouter-mirroragent'
-    jobs:
+---
+- project:
+    name: dmaap-messagerouter-mirroragent
+    project-name: 'dmaap-messagerouter-mirroragent'
+    jobs:
       - gerrit-maven-clm:
           java-version: ''
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      - '{project-name}-{stream}-stage-site-java':
-          site-pom: 'pom.xml'
-          trigger-job: '{project-name}-{stream}-release-version-java-daily'
-          mvn-goals: 'clean install'
-    project: 'dmaap/messagerouter/mirroragent'
-    stream:
-      - 'master':
-          branch: 'master'
+      - '{project-name}-{stream}-verify-java'
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - '{project-name}-{stream}-stage-site-java':
+          site-pom: 'pom.xml'
+          trigger-job: '{project-name}-{stream}-release-version-java-daily'
+          mvn-goals: 'clean install'
+    project: 'dmaap/messagerouter/mirroragent'
+    stream:
+      - 'master':
+          branch: 'master'
       - 'amsterdam':
           branch: 'amsterdam'
-    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
-    files: '**'
-    archive-artifacts: ''
\ No newline at end of file
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    files: '**'
+    archive-artifacts: ''
+- project:
+    name: dmaap-messagerouter-mirroragent-sonar
+    jobs:
+      - gerrit-maven-sonar
+    java-version: ''
+    project: 'dmaap/messagerouter/mirroragent'
+    project-name: 'dmaap-messagerouter-mirroragent'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
-- 
cgit 1.2.3-korg