[DMAAP-MR] Remove H branch due to Java8 dep

[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 ddd8c40..acfab9e 100644 (file)
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -38,11 +38,10 @@
           container-staging-registry: 'nexus3.onap.org:10003'
     project: 'dmaap/messagerouter/messageservice'
     stream:
-      - 'honolulu':
-          branch: 'honolulu'
-      - 'guilin':
-          branch: 'guilin'
+      - 'istanbul':
+          branch: 'istanbul'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
     files: '**'
     archive-artifacts: ''
     docker-pom: 'pom.xml'
@@ -52,17 +51,19 @@
 - project:
     name: dmaap-csit
     jobs:
-      - '{project-name}-{stream}-csit-{functionality}'
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-    project-name: 'dmaap'
+      - '{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'
-    functionality:
-      - 'mrpubsub':
-          trigger_jobs:
-            - '{project-name}-maven-docker-stage-{stream}'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     robot-options: ''
 
 - project:
@@ -82,6 +83,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
@@ -92,6 +94,7 @@
     project-name: 'dmaap-messagerouter-messageservice'
     branch: 'master'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
+    java-version: openjdk11
 
 - project:
     name: dmaap-messagerouter-messageservice-info