X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fdmaap%2Fdmaap-messagerouter-dmaapclient.yaml;h=7c9d9d626cfa151a9f201570e5af4147bb1929f3;hb=c9ed78c4227e52c5fedab9fa5389fbb60d5c3184;hp=8e0dbf6c58683d753b2d2e588771485bdac0843a;hpb=e18c2fac9e190581ed2d4f42e74b4b9e89fa88b0;p=ci-management.git

diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 8e0dbf6c5..7c9d9d626 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -1,81 +1,52 @@
 ---
 - 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'
+      - "{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
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dmaap/messagerouter/dmaapclient'
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "dmaap/messagerouter/dmaapclient"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    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'
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
     build-node: ubuntu1804-builder-4c-4g
-    project: 'dmaap/messagerouter/dmaapclient'
-    project-name: 'dmaap-messagerouter-dmaapclient'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/messagerouter/dmaapclient"
+    project-name: "dmaap-messagerouter-dmaapclient"
+    branch: "master"
+    mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
     java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-dmaapclient-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dmaap/messagerouter/dmaapclient
-    project-name: 'dmaap-messagerouter-dmaapclient'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
+    project-name: "dmaap-messagerouter-dmaapclient"
+    branch: "master"
+    mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
     java-version: openjdk11
-
-- project:
-    name: dmaap-messagerouter-dmaapclient-info
-    project-name: dmaap-messagerouter-dmaapclient
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dmaap/messagerouter/dmaapclient
-    branch: master