X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-messagerouter-messageservice.yaml;h=30db7f59c9f0960b08a6bc71091271e8b5d4566f;hb=8c190c5efc31923635997bf51c08a4e3a8488e44;hp=394a920d72a198a8719aff0ea12028b1bb77f8b8;hpb=fa9af29e8f6f9fd867cde96a17bf522d1b27d7cd;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 394a920d7..30db7f59c 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: dmaap-messagerouter-messageservice-java-11
-    project-name: 'dmaap-messagerouter-messageservice-java-11'
+    name: dmaap-messagerouter-messageservice-java
+    project-name: 'dmaap-messagerouter-messageservice-java'
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -11,12 +11,15 @@
           maven-versions-plugin: true
           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/messagerouter/messageservice'
     stream:
       - 'master':
           branch: 'master'
+      - 'kohn':
+          branch: 'kohn'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     java-version: openjdk11
     files: '**'
@@ -24,30 +27,6 @@
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
 
-- project:
-    name: dmaap-messagerouter-messageservice-maintenance
-    project-name: 'dmaap-messagerouter-messageservice-maintenance'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          maven-versions-plugin: true
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-    project: 'dmaap/messagerouter/messageservice'
-    stream:
-      - 'istanbul':
-          branch: 'istanbul'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    java-version: openjdk11
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    cron: ''
-
 - project:
     name: dmaap-csit
     jobs:
@@ -72,10 +51,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/messagerouter/messageservice'
     project-name: 'dmaap-messagerouter-messageservice'
@@ -95,8 +72,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     java-version: openjdk11
 
@@ -105,6 +80,6 @@
     project-name: dmaap-messagerouter-messageservice
     jobs:
       - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
+    build-node: centos8-builder-2c-1g
     project: dmaap/messagerouter/messageservice
     branch: master