X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-datarouter.yaml;h=d5e504bb538c8ed01b8bd8f5000bd4939287b95b;hb=0e9584e187edb624e37bb3f1845df100bf8b5a1d;hp=b79f2ed54c4b98cdcbf85214a2febae5edbe4473;hpb=2d0e40b49c7bf799c9a13d033f8aa15b5a86bde8;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index b79f2ed54..d5e504bb5 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: dmaap-datarouter-java11
+    name: dmaap-datarouter-java
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
@@ -17,49 +17,29 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
-- project:
-    name: dmaap-datarouter-maintenance-java11
-    project-name: 'dmaap-datarouter-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          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/datarouter'
-    stream:
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
-    mvn-settings: 'dmaap-datarouter-settings'
-    files: '**'
-    archive-artifacts: ''
-    java-version: openjdk11
-    cron: ''
-
 - project:
     name: dmaap-datarouter-csit-ssl
     jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-      - '{project-name}-{stream}-verify-csit-{functionality}'
+      - '{project-name}-review-verification-maven-{stream}':
+            mvn-goals: clean package
+            mvn-params: '-P docker docker:build -DskipTests=false'
+      - '{project-name}-merge-verification-maven-{stream}':
+            mvn-goals: clean package
+            mvn-params: '-P docker docker:build'
     project-name: 'dmaap-datarouter'
     recipients: 'fiachra.corcoran@est.tech'
+    project: 'dmaap/datarouter'
     stream:
       - 'master':
-          branch: 'master'
-    functionality:
-      - 'ssl-dr-suite':
-          trigger_jobs:
-            - '{project-name}-maven-docker-stage-{stream}'
+            branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
     robot-options: ''
 
 - project:
@@ -72,7 +52,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/datarouter'
     project-name: 'dmaap-datarouter'
     branch: 'master'