Merge "[DMAAP] Refactor dmaap jobs"

13 files changed, 52 insertions, 99 deletions

diff --git a/jjb/dmaap/dmaap-buscontroller-csit.yaml b/jjb/dmaap/dmaap-buscontroller-csit.yaml
index 2fc6419ff..35f50610a 100644
--- a/jjb/dmaap/dmaap-buscontroller-csit.yaml
+++ b/jjb/dmaap/dmaap-buscontroller-csit.yaml
@@ -6,17 +6,17 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
     project-name: 'dmaap-buscontroller'
     recipients: 'fiachra.corcoran@est.tech'
-    stream: 'master'
-    disabled: false
+    stream:
+      - 'master':
+          branch: 'master'
     functionality:
       - 'ssl':
           trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+            - '{project-name}-maven-docker-stage-{stream}'
       - 'with_mr':
           trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+            - '{project-name}-maven-docker-stage-{stream}'
       - 'with_dr':
           trigger_jobs:
-            - '{project-name}-{stream}-release-java-daily-checkstyle'
+            - '{project-name}-maven-docker-stage-{stream}'
     robot-options: ''
-    branch: 'master'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 1a291462f..2c3de532a 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -22,6 +22,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-buscontroller-settings'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3e3676bc0..8c7774769 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,3 +1,4 @@
+---
 - project:
     name: dmaap-datarouter-java11
     project-name: 'dmaap-datarouter'
@@ -6,6 +7,7 @@
       - '{project-name}-{stream}-merge-java'
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
           mvn-goals: 'clean package -P docker docker:build docker:push'
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
@@ -15,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-datarouter-settings'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index cfe816d8c..b61a15cab 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -17,6 +17,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     # due to a strange macro / variable translation problem this needs to be
diff --git a/jjb/dmaap/dmaap-kafka-docker.yaml b/jjb/dmaap/dmaap-kafka-docker.yaml
deleted file mode 100644
index 1b3bfa6f8..000000000
--- a/jjb/dmaap/dmaap-kafka-docker.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-
-- project:
-    name: dmaap-kafka-docker
-    project-name: 'dmaap-kafka-docker'
-    jobs:
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: true
-          mvn-params: '-P docker -Dmaven.test.skip=true'
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dmaap/kafka11aaf'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-kafka11aaf-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dmaap-kafka-docker-info
-    project-name: dmaap-kafka-docker
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dmaap/kafka11aaf
-    branch: master
diff --git a/jjb/dmaap/dmaap-csit.yaml b/jjb/dmaap/dmaap-messagerouter-csit.yaml
index 8bea9e17d..109cbcc18 100644
--- a/jjb/dmaap/dmaap-csit.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-csit.yaml
@@ -6,9 +6,11 @@
       - '{project-name}-{stream}-verify-csit-{functionality}'
     project-name: 'dmaap'
     recipients: 'fiachra.corcoran@est.tech'
-    stream: 'master'
+    stream:
+      - 'master':
+          branch: 'master'
     functionality:
       - 'mrpubsub':
           trigger_jobs:
+            - '{project-name}-maven-docker-stage-{stream}'
     robot-options: ''
-    branch: 'master'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index f84117476..b1855ea8f 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -15,6 +15,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
deleted file mode 100644
index 82c12d3d3..000000000
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-
-- project:
-    name: dmaap-messagerouter-docker
-    project-name: 'dmaap-messagerouter-docker'
-    jobs:
-      - 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-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: 'dmaap/messagerouter/messageservice'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-    files: '**'
-    archive-artifacts: ''
-    docker-pom: 'pom.xml'
-    mvn-profile: 'docker'
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dmaap-messagerouter-docker-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dmaap/messagerouter/messageservice
-    project-name: 'dmaap-messagerouter-docker'
-    build-node: ubuntu1804-docker-8c-8g
-    branch: 'master'
-    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
-
-- project:
-    name: dmaap-messagerouter-docker-info
-    project-name: dmaap-messagerouter-docker
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: dmaap/messagerouter/messageservice
-    branch: master
diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
index 65d7dbcf4..e469a1d60 100644
--- a/jjb/dmaap/dmaap-kafka.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-kafka.yaml
@@ -5,13 +5,25 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
+      - gerrit-maven-docker-stage:
+          build-node: ubuntu1804-docker-8c-8g
+          maven-versions-plugin: true
+          mvn-params: '-P docker -Dmaven.test.skip=true'
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dmaap/kafka11aaf'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-kafka11aaf-settings'
+    files: '**'
+    archive-artifacts: ''
 
 - project:
     name: dmaap-kafka-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 5f3858bc0..64e940591 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -9,16 +9,27 @@
           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'
+          maven-versions-plugin: true
+          container-public-registry: 'nexus3.onap.org:10001'
+          container-staging-registry: 'nexus3.onap.org:10003'
+      - '{project-name}-gerrit-release-jobs':
+          build-node: centos7-docker-8c-8g
     project: 'dmaap/messagerouter/messageservice'
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     files: '**'
     archive-artifacts: ''
+    docker-pom: 'pom.xml'
+    mvn-profile: 'docker'
 
 - project:
     name: dmaap-messagerouter-messageservice-sonar
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index a90b327ed..e5dd58872 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 7e2271638..1772783ec 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -16,6 +16,8 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
       - 'guilin':
           branch: 'guilin'
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
index 5854bcca5..d704af6b5 100644
--- a/jjb/dmaap/dmaap-zookeeper.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-zookeeper.yaml
@@ -3,19 +3,6 @@
     name: dmaap-zookeeper
     project-name: 'dmaap-zookeeper'
     jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-    project: 'dmaap/zookeeper'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'guilin':
-          branch: 'guilin'
-    mvn-settings: 'dmaap-zookeeper-settings'
-- project:
-    name: dmaap-zookeeper-docker
-    project-name: 'dmaap-zookeeper-docker'
-    jobs:
       - gerrit-maven-docker-stage:
           build-node: ubuntu1804-docker-8c-8g
           mvn-params: '-P docker -Dmaven.test.skip=true'
@@ -28,6 +15,10 @@
     stream:
       - 'master':
           branch: 'master'
+      - 'honolulu':
+          branch: 'honolulu'
+      - 'guilin':
+          branch: 'guilin'
     mvn-settings: 'dmaap-zookeeper-settings'
     files: '**'
     archive-artifacts: ''