X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-buscontroller.yaml;h=b74439e86c189c9c07e68b5e691dede4188812dc;hb=ffc3ac818c92944c9b956633550a461457d10d36;hp=39a6a379c31526699e57b67b7d08e52ebe2bbfd4;hpb=7134c4d1f0f277c563bd649d09e5d57c83a6bce8;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 39a6a379c..b74439e86 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,14 +6,14 @@
       - project-view
 
 - project:
-    name: dmaap-buscontroller-java11
+    name: dmaap-buscontroller-java
     project-name: 'dmaap-buscontroller'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package -P docker docker:build docker:push'
+          mvn-goals: 'clean package -P docker docker:build docker:push -DskipTests=true'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
       - '{project-name}-gerrit-release-jobs':
@@ -22,35 +22,49 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'frankfurt':
-          branch: 'frankfurt'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
 - project:
-    name: dmaap-buscontroller-java8
-    project-name: 'dmaap-buscontroller'
+    name: dmaap-buscontroller-csit
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: 'clean package -P docker docker:build docker:push'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-review-verification-maven-{stream}':
+            mvn-goals: clean install
+            mvn-params: '-P docker -DskipTests=true'
+      - '{project-name}-merge-verification-maven-{stream}':
+            mvn-goals: clean install
+            mvn-params: '-P docker -DskipTests=true'
+    project-name: 'dmaap-buscontroller'
+    recipients: 'fiachra.corcoran@est.tech'
     project: 'dmaap/buscontroller'
     stream:
-      - 'elalto':
-          branch: 'elalto'
+      - 'master':
+            branch: 'master'
     mvn-settings: 'dmaap-buscontroller-settings'
-    files: '**'
-    archive-artifacts: ''
-    java-version: openjdk8
+    robot-options: ''
 
-# removed sonar job from this template because this repo only builds a docker container
-# and the 0% coverage report from Sonar was causing repeated escalations.
+- project:
+    name: dmaap-buscontroller-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
+    cron: '@daily'
+    build-node: ubuntu1804-builder-4c-4g
+    project: 'dmaap/buscontroller'
+    project-name: 'dmaap-buscontroller'
+    branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
+    mvn-goals: 'clean install'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-buscontroller-clm
@@ -61,6 +75,7 @@
     project-name: 'dmaap-buscontroller'
     branch: 'master'
     mvn-settings: 'dmaap-buscontroller-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-buscontroller-info