X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-buscontroller.yaml;h=e2cc2f2caf107574b040f179ed8ecb510f4cfb29;hb=8c190c5efc31923635997bf51c08a4e3a8488e44;hp=5531bb9f48be877e7ab930f466fbc150eb61bcd2;hpb=f4bb4800cf2bc3f364f6c5bebdc8b0cd7788d498;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 5531bb9f4..e2cc2f2ca 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,49 +6,30 @@
       - 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'
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'dmaap/buscontroller'
     stream:
       - 'master':
           branch: 'master'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'dmaap-buscontroller-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
-- project:
-    name: dmaap-buscontroller-maintenance-java11
-    project-name: 'dmaap-buscontroller-maintenance'
-    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: 'dmaap/buscontroller'
-    stream:
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
-    mvn-settings: 'dmaap-buscontroller-settings'
-    files: '**'
-    archive-artifacts: ''
-    java-version: openjdk11
-    cron: ''
-
 - project:
     name: dmaap-buscontroller-csit
     jobs:
@@ -57,15 +38,13 @@
             mvn-params: '-P docker -DskipTests=true'
       - '{project-name}-merge-verification-maven-{stream}':
             mvn-goals: clean install
-            mvn-params: '-P docker'
+            mvn-params: '-P docker -DskipTests=true'
     project-name: 'dmaap-buscontroller'
     recipients: 'fiachra.corcoran@est.tech'
     project: 'dmaap/buscontroller'
     stream:
       - 'master':
             branch: 'master'
-      - 'honolulu':
-            branch: 'honolulu'
     mvn-settings: 'dmaap-buscontroller-settings'
     robot-options: ''
 
@@ -75,10 +54,8 @@
       - 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'
@@ -104,6 +81,6 @@
     project-name: dmaap-buscontroller
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/buscontroller
     branch: master