X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-datarouter.yaml;h=8c7774769441e07ae496737e8ee2cd1dba52f5c9;hb=refs%2Fchanges%2F53%2F119153%2F4;hp=ba7cb67be5add8147356ce0b1f0700690f95770e;hpb=619a90a33ad39adf5de6ec9d7cb0a8ad3df0978a;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index ba7cb67be..8c7774769 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,76 +1,50 @@
+---
 - project:
-    name: dmaap-datarouter
+    name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      #
-      # see DMAAP-334 for more details, but
-      #     - '{project-name}-{stream}-docker-java-daily':
-      # doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
-          mvn-goals: 'clean package -P docker docker:build docker:push'
-          # No-op
-          script: '/bin/true'
-          build-node: 'ubuntu1604-docker-8c-8g'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
       - gerrit-maven-docker-stage:
-          build-node: ubuntu1604-docker-8c-8g
-          mvn-goals: 'clean package -P docker docker:build -DpushImage'
+          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-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dmaap/datarouter'
     stream:
       - 'master':
           branch: 'master'
-      - 'dublin':
-          branch: 'dublin'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'dmaap-datarouter-settings'
     files: '**'
     archive-artifacts: ''
+    java-version: openjdk11
 
-- project:
-    name: dmaap-datarouter-casablanca
-    project-name: 'dmaap-datarouter'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-      #
-      # see DMAAP-334 for more details, but
-      #     - '{project-name}-{stream}-docker-java-daily':
-      # doesn't support mvn-goals override, so trying this...
-      - '{project-name}-{stream}-docker-java-shell-daily':
-            mvn-goals: 'clean package -P docker docker:build -DpushImage'
-            # No-op
-            script: '/bin/true'
-            build-node: 'ubuntu1604-docker-8c-8g'
-
-    project: 'dmaap/datarouter'
-    stream:
-      - 'casablanca':
-          branch: 'casablanca'
-    mvn-settings: 'dmaap-datarouter-settings'
-    files: '**'
-    archive-artifacts: ''
 
 - project:
     name: dmaap-datarouter-sonar
     jobs:
       - 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: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-builder-4c-4g
     project: 'dmaap/datarouter'
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-clm
@@ -81,11 +55,13 @@
     project-name: 'dmaap-datarouter'
     branch: 'master'
     mvn-settings: 'dmaap-datarouter-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-datarouter-info
     project-name: dmaap-datarouter
     jobs:
       - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
     project: dmaap/datarouter
     branch: master