Merge "DMAAP-Refactor CLM project block"

8 files changed, 72 insertions, 8 deletions

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 2af0e8d96..21077e660 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -4,7 +4,6 @@
     name: dmaap-buscontroller
     project-name: 'dmaap-buscontroller'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -29,3 +28,12 @@
 
 # removed sonar job from this template because this repo only builds a docker container
 # and the 0% coverage report from Sonar was causing repeated escalations.
+
+- project:
+    name: dmaap-buscontroller-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/buscontroller
+    project-name: 'dmaap-buscontroller'
+    branch: 'master'
+    mvn-settings: 'dmaap-buscontroller-settings'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3f94599f3..516d7eb38 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -2,7 +2,6 @@
     name: dmaap-datarouter
     project-name: 'dmaap-datarouter'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -37,3 +36,11 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: dmaap-datarouter-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/datarouter
+    project-name: 'dmaap-datarouter'
+    branch: 'master'
+    mvn-settings: 'dmaap-datarouter-settings'
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index e52b09f0c..d4fb4a1fa 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -3,7 +3,6 @@
     name: dmaap-dbcapi
     project-name: 'dmaap-dbcapi'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -32,3 +31,12 @@
     mvn-settings: 'dmaap-dbcapi-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-dbcapi-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/dbcapi
+    project-name: 'dmaap-dbcapi'
+    branch: 'master'
+    mvn-settings: 'dmaap-dbcapi-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 7efe1ef16..85ff59f84 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-dmaapclient
     project-name: 'dmaap-messagerouter-dmaapclient'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
     mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-dmaapclient-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/dmaapclient
+    project-name: 'dmaap-messagerouter-dmaapclient'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-dmaapclient-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-docker.yaml b/jjb/dmaap/dmaap-messagerouter-docker.yaml
index 18d9d1cdc..ff5847346 100644
--- a/jjb/dmaap/dmaap-messagerouter-docker.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-docker.yaml
@@ -4,7 +4,6 @@
     name: dmaap-messagerouter-docker
     project-name: 'dmaap-messagerouter-docker'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-docker-version-java-daily':
           mvn-params: '-Dmaven.test.skip=true'
       - '{project-name}-{stream}-docker-java-daily':
@@ -19,3 +18,13 @@
     docker-pom: 'pom.xml'
     mvn-profile: 'docker'
     build-node: ubuntu1604-docker-8c-8g
+
+- project:
+    name: dmaap-messagerouter-docker-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/messageservice
+    project-name: 'dmaap-messagerouter-docker'
+    build-node: ubuntu1604-docker-8c-8g
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 914e994ad..1ff349c2c 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-messageservice
     project-name: 'dmaap-messagerouter-messageservice'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
     mvn-settings: 'dmaap-messagerouter-messageservice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-messageservice-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/messageservice
+    project-name: 'dmaap-messagerouter-messageservice'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-messageservice-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index 1f888b114..3ec04eb73 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-mirroragent
     project-name: 'dmaap-messagerouter-mirroragent'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
     mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-mirroragent-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/mirroragent
+    project-name: 'dmaap-messagerouter-mirroragent'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-mirroragent-settings'
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 388ecfbb1..fdd472dde 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -3,7 +3,6 @@
     name: dmaap-messagerouter-msgrtr
     project-name: 'dmaap-messagerouter-msgrtr'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -27,3 +26,12 @@
     mvn-settings: 'dmaap-messagerouter-msgrtr-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: dmaap-messagerouter-msgrtr-clm
+    jobs:
+      - gerrit-maven-clm
+    project: dmaap/messagerouter/msgrtr
+    project-name: 'dmaap-messagerouter-msgrtr'
+    branch: 'master'
+    mvn-settings: 'dmaap-messagerouter-msgrtr-settings'