Chore: Revert back to ubuntu1804-builder

[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 64e9405..a679666 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -1,14 +1,10 @@
 ---
 - 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
-          maven-versions-plugin: true
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-params: '-P docker -Dmaven.test.skip=true'
@@ -21,16 +17,33 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
+      - 'jakarta':
+          branch: 'jakarta'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
 
+- 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'
+    robot-options: ''
+
 - project:
     name: dmaap-messagerouter-messageservice-sonar
     jobs:
@@ -48,6 +61,7 @@
     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
@@ -56,8 +70,11 @@
     nexus-iq-namespace: 'onap-'
     project: dmaap/messagerouter/messageservice
     project-name: 'dmaap-messagerouter-messageservice'
-    branch: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-info