X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-buscontroller.yaml;h=7886d440d49e832c3ce5f51c6efc579f2a122592;hb=0e9584e187edb624e37bb3f1845df100bf8b5a1d;hp=3136272a6dd0b54efa8e005639fbf755882d4dc4;hpb=949e11b47f4f750ac7b626d35368f3296740046b;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 3136272a6..7886d440d 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -6,13 +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':
@@ -21,34 +22,13 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     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,7 +37,7 @@
             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'
@@ -77,7 +57,7 @@
     sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1804-builder-4c-4g
+    build-node: ubuntu2004-builder-4c-4g
     project: 'dmaap/buscontroller'
     project-name: 'dmaap-buscontroller'
     branch: 'master'