X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-datarouter.yaml;h=d9ecb982661362c019259d9575cd6d737de83809;hb=627a2bfc1daf1c3b458d46a71bb714f9010cf09a;hp=ffd5a2d8ec1a9a3ed2f6053126e361cc8e39e7f7;hpb=12ca4fb18f2e06ebc5f47c1114645a6cd171d620;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index ffd5a2d8e..d9ecb9826 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,47 +1,47 @@
+---
 - 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'
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
-
 - project:
-    name: dmaap-datarouter-java8
-    project-name: 'dmaap-datarouter'
+    name: dmaap-datarouter-csit-ssl
     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 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:
-      - 'frankfurt':
-          branch: 'frankfurt'
-      - 'elalto':
-          branch: 'elalto'
+      - 'master':
+            branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
-    files: '**'
-    archive-artifacts: ''
-    java-version: openjdk8
+    robot-options: ''
 
 - project:
     name: dmaap-datarouter-sonar
@@ -49,10 +49,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/datarouter'
     project-name: 'dmaap-datarouter'
@@ -78,6 +76,6 @@
     project-name: dmaap-datarouter
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/datarouter
     branch: master