[DMAAP] Fix london branch jobs

[ci-management.git] / jjb / dmaap / dmaap-messagerouter-messageservice.yaml

diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 3c0df03..934b0a8 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,56 +1,85 @@
 ---
 - project:
-    name: dmaap-messagerouter-messageservice
-    project-name: 'dmaap-messagerouter-messageservice'
+    name: dmaap-messagerouter-messageservice-java
+    project-name: "dmaap-messagerouter-messageservice-java"
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
+      - "{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"
+          cron: ""
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    project: "dmaap/messagerouter/messageservice"
+    stream:
+      - "master":
+          branch: "master"
+      - "london":
+          branch: "london"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
+    java-version: openjdk11
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    mvn-profile: "docker"
 
-    project: 'dmaap/messagerouter/messageservice'
+- project:
+    name: dmaap-csit
+    jobs:
+      - "{project-name}-review-verification-maven-{stream}":
+          mvn-goals: clean deploy
+          mvn-params: "-P docker -Dskip.deploy=true -Dskip.docker.push=true"
+      - "{project-name}-merge-verification-maven-{stream}":
+          mvn-goals: clean deploy
+          mvn-params: "-P docker -DskipTests=true -Dskip.deploy=true -Dskip.docker.push=true"
+    project-name: "dmaap-messagerouter-messageservice"
+    project: "dmaap/messagerouter/messageservice"
+    recipients: "fiachra.corcoran@est.tech"
     stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    files: '**'
-    archive-artifacts: ''
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
+    robot-options: ""
 
 - project:
     name: dmaap-messagerouter-messageservice-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/messageservice'
-    project-name: 'dmaap-messagerouter-messageservice'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    project: "dmaap/messagerouter/messageservice"
+    project-name: "dmaap-messagerouter-messageservice"
+    branch: "master"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-clm
     jobs:
       - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
+    nexus-iq-namespace: "onap-"
     project: dmaap/messagerouter/messageservice
-    project-name: 'dmaap-messagerouter-messageservice'
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    project-name: "dmaap-messagerouter-messageservice"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "dmaap-messagerouter-messageservice-settings"
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-info
     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