X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fdmaap%2Fdmaap-messagerouter-dmaapclient.yaml;h=6f70c585c07f2e8f35d33b1ccdd3154c3f5d8675;hb=030eedbc7ce2a8bb55d1365124636b394f744eb0;hp=8e0dbf6c58683d753b2d2e588771485bdac0843a;hpb=75101a80d822912a7fae8d9a3d7cd4a4a0d48fc1;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 8e0dbf6c5..6f70c585c 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,56 +1,36 @@
 ---
 - project:
-    name: dmaap-messagerouter-dmaapclient-java11
-    project-name: 'dmaap-messagerouter-dmaapclient-java11'
+    name: dmaap-messagerouter-dmaapclient-java
+    project-name: 'dmaap-messagerouter-dmaapclient-java'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-stage:
           sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-docker-4c-4g
           maven-versions-plugin: true
+          cron: ''
       - '{project-name}-gerrit-release-jobs':
           build-node: centos7-docker-8c-8g
     project: 'dmaap/messagerouter/dmaapclient'
     stream:
       - 'master':
           branch: 'master'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     files: '**'
     archive-artifacts: ''
     java-version: openjdk11
 
-- project:
-    name: dmaap-messagerouter-dmaapclient-maintenance
-    project-name: 'dmaap-messagerouter-dmaapclient-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-    project: 'dmaap/messagerouter/dmaapclient'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
-    files: '**'
-    archive-artifacts: ''
-    cron: ''
-
 - project:
     name: dmaap-messagerouter-dmaapclient-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: ubuntu1804-builder-4c-4g
     project: 'dmaap/messagerouter/dmaapclient'
     project-name: 'dmaap-messagerouter-dmaapclient'
@@ -76,6 +56,6 @@
     project-name: dmaap-messagerouter-dmaapclient
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/messagerouter/dmaapclient
     branch: master