Chore: Move to ubuntu2004-builder

[ci-management.git] / jjb / dmaap / dmaap-datarouter.yaml

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3e3676b..d5e504b 100644 (file)
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,11 +1,13 @@
+---
 - project:
-    name: dmaap-datarouter-java11
+    name: dmaap-datarouter-java
     project-name: 'dmaap-datarouter'
     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'
@@ -15,13 +17,30 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
+- project:
+    name: dmaap-datarouter-csit-ssl
+    jobs:
+      - '{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'
+    mvn-settings: 'dmaap-datarouter-settings'
+    robot-options: ''
 
 - project:
     name: dmaap-datarouter-sonar
@@ -33,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'