Merge "Refactor CLM jobs for AAI"

23 files changed, 216 insertions, 25 deletions

diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 56b992561..366891c1b 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -3,7 +3,6 @@
     name: aai-aai-common-master
     project-name: 'aai-aai-common'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -32,3 +31,13 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-aai-common-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/aai-common'
+    project-name: 'aai-aai-common'
+    branch: 'master'
+    mvn-settings: 'aai-aai-common-settings'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml
index 081bb2730..53401e822 100644
--- a/jjb/aai/aai-babel.yaml
+++ b/jjb/aai/aai-babel.yaml
@@ -3,7 +3,6 @@
     name: aai-babel
     project-name: 'aai-babel'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,14 @@
     mvn-settings: 'aai-babel-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-babel-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/babel'
+    project-name: 'aai-babel'
+    branch: 'master'
+    mvn-settings: 'aai-babel-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml
index 2df4345c1..d3937f0bc 100644
--- a/jjb/aai/aai-cacher.yaml
+++ b/jjb/aai/aai-cacher.yaml
@@ -3,7 +3,6 @@
     name: aai-cacher-master
     project-name: 'aai-cacher'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -34,3 +33,14 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-cacher-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/cacher'
+    project-name: 'aai-cacher'
+    branch: 'master'
+    mvn-settings: 'aai-cacher-settings'
+    mvn-version: 'mvn35'
+
diff --git a/jjb/aai/aai-chameleon.yaml b/jjb/aai/aai-chameleon.yaml
index 040d3bb56..ddf37af5b 100644
--- a/jjb/aai/aai-chameleon.yaml
+++ b/jjb/aai/aai-chameleon.yaml
@@ -3,7 +3,6 @@
     name: aai-chameleon
     project-name: 'aai-chameleon'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -18,3 +17,12 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: aai-chameleon-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/chameleon'
+    project-name: 'aai-chameleon'
+    branch: 'master'
+    mvn-settings: 'aai-chameleon-settings'
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index dcbc03d9c..c4c369db9 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -3,7 +3,6 @@
     name: aai-champ
     project-name: 'aai-champ'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
     mvn-settings: 'aai-champ-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-champ-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/champ'
+    project-name: 'aai-champ'
+    branch: 'master'
+    mvn-settings: 'aai-champ-settings'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index 785a86e54..e14edd682 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -3,7 +3,6 @@
     name: aai-data-router-master
     project-name: 'aai-data-router'
     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: 'aai-data-router-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-data-router-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/data-router'
+    project-name: 'aai-data-router'
+    branch: 'master'
+    mvn-settings: 'aai-data-router-settings'
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index 84206f301..f5c9b83dc 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -3,7 +3,6 @@
     name: aai-esr-gui
     project-name: 'aai-esr-gui'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -21,3 +20,11 @@
     mvn-profile: docker
     build-node: ubuntu1604-builder-4c-4g
 
+- project:
+    name: aai-esr-gui-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/esr-gui'
+    project-name: 'aai-esr-gui'
+    branch: 'master'
+    mvn-settings: 'aai-esr-gui-settings'
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index fec958339..3c580fc63 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -3,7 +3,6 @@
     name: aai-esr-server-master
     project-name: 'aai-esr-server'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
     mvn-settings: 'aai-esr-server-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-esr-server-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/esr-server'
+    project-name: 'aai-esr-server'
+    branch: 'master'
+    mvn-settings: 'aai-esr-server-settings'
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index 9f8ea5596..a315c7800 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -3,7 +3,6 @@
     name: aai-event-client-master
     project-name: 'aai-event-client'
     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 @@
     mvn-settings: 'aai-event-client-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-event-client-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/event-client'
+    project-name: 'aai-event-client'
+    branch: 'master'
+    mvn-settings: 'aai-event-client-settings'
diff --git a/jjb/aai/aai-gallifrey.yaml b/jjb/aai/aai-gallifrey.yaml
index cda1885a7..c85324d67 100644
--- a/jjb/aai/aai-gallifrey.yaml
+++ b/jjb/aai/aai-gallifrey.yaml
@@ -3,7 +3,6 @@
     name: aai-gallifrey
     project-name: 'aai-gallifrey'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -18,3 +17,12 @@
     mvn-settings: 'aai-gallifrey-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aai-gallifrey-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/gallifrey'
+    project-name: 'aai-gallifrey'
+    branch: 'master'
+    mvn-settings: 'aai-gallifrey-settings'
diff --git a/jjb/aai/aai-gizmo.yaml b/jjb/aai/aai-gizmo.yaml
index 3c2cb89a7..af09abed8 100644
--- a/jjb/aai/aai-gizmo.yaml
+++ b/jjb/aai/aai-gizmo.yaml
@@ -3,7 +3,6 @@
     name: aai-gizmo
     project-name: 'aai-gizmo'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
     mvn-settings: 'aai-gizmo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-gizmo-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/gizmo'
+    project-name: 'aai-gizmo'
+    branch: 'master'
+    mvn-settings: 'aai-gizmo-settings'
diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml
index 25366b74c..b51e25df7 100644
--- a/jjb/aai/aai-graphadmin.yaml
+++ b/jjb/aai/aai-graphadmin.yaml
@@ -3,7 +3,6 @@
     name: aai-graphadmin-master
     project-name: 'aai-graphadmin'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -34,3 +33,13 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-graphadmin-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/graphadmin'
+    project-name: 'aai-graphadmin'
+    branch: 'master'
+    mvn-settings: 'aai-graphadmin-settings'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index b2f451703..5ad4cc383 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -3,7 +3,6 @@
     name: aai-logging-service-master
     project-name: 'aai-logging-service'
     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 @@
     mvn-settings: 'aai-logging-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-logging-service-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/logging-service'
+    project-name: 'aai-logging-service'
+    branch: 'master'
+    mvn-settings: 'aai-logging-service-settings'
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 93eef3323..502ff367e 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -3,7 +3,6 @@
     name: aai-model-loader-master
     project-name: 'aai-model-loader'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -33,3 +32,12 @@
     mvn-settings: 'aai-model-loader-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-model-loader-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/model-loader'
+    project-name: 'aai-model-loader'
+    branch: 'master'
+    mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index e88c0f90c..8736dc342 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -3,7 +3,6 @@
     name: aai-resources
     project-name: 'aai-resources'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -36,3 +35,13 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-resources-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/resources'
+    project-name: 'aai-resources'
+    branch: 'master'
+    mvn-settings: 'aai-resources-settings'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index 4ea031a26..ac986ad07 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -3,7 +3,6 @@
     name: aai-rest-client-master
     project-name: 'aai-rest-client'
     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 @@
     mvn-settings: 'aai-rest-client-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-rest-client-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/rest-client'
+    project-name: 'aai-rest-client'
+    branch: 'master'
+    mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index 45d20fe07..4fba71166 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -3,7 +3,6 @@
     name: aai-router-core-master
     project-name: 'aai-router-core'
     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 @@
     mvn-settings: 'aai-router-core-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-router-core-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/router-core'
+    project-name: 'aai-router-core'
+    branch: 'master'
+    mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index 4434a2373..55263075e 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -3,7 +3,6 @@
     name: aai-search-data-service-master
     project-name: 'aai-search-data-service'
     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: 'aai-search-data-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-search-data-service-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/search-data-service'
+    project-name: 'aai-search-data-service'
+    branch: 'master'
+    mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index c64649298..a73aa5689 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -3,7 +3,6 @@
     name: aai-sparky-be-master
     project-name: 'aai-sparky-be'
     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: 'aai-sparky-be-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-sparky-be-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/sparky-be'
+    project-name: 'aai-sparky-be'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 7036e584f..789d52775 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -4,7 +4,6 @@
     project-name: 'aai-sparky-fe'
     build-node: 'centos7-builder-4c-4g'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -17,3 +16,12 @@
     mvn-settings: 'aai-sparky-fe-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aai-sparky-fe-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/sparky-fe'
+    project-name: 'aai-sparky-fe'
+    branch: 'master'
+    mvn-settings: 'aai-sparky-fe-settings'
diff --git a/jjb/aai/aai-spike.yaml b/jjb/aai/aai-spike.yaml
index ce7071460..e4af01c6a 100644
--- a/jjb/aai/aai-spike.yaml
+++ b/jjb/aai/aai-spike.yaml
@@ -3,7 +3,6 @@
     name: aai-spike
     project-name: 'aai-spike'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -29,4 +28,13 @@
     project-name: 'aai-spike'
     branch: 'master'
     mvn-settings: 'aai-spike-settings'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-spike-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/spike'
+    project-name: 'aai-spike'
+    branch: 'master'
+    mvn-settings: 'aai-spike-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 830ff4326..d5df3d7c9 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -3,7 +3,6 @@
     name: aai-traversal-master
     project-name: 'aai-traversal'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -36,3 +35,13 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: 'mvn35'
+
+- project:
+    name: aai-traversal-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/traversal'
+    project-name: 'aai-traversal'
+    branch: 'master'
+    mvn-settings: 'aai-traversal-settings'
+    mvn-version: 'mvn35'
diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml
index d66e77ad3..2457e06dc 100644
--- a/jjb/aai/aai-validation.yaml
+++ b/jjb/aai/aai-validation.yaml
@@ -3,7 +3,6 @@
     name: aai-validation
     project-name: 'aai-validation'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -30,4 +29,13 @@
     branch: 'master'
     mvn-settings: 'aai-validation-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aai-validation-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aai/validation'
+    project-name: 'aai-validation'
+    branch: 'master'
+    mvn-settings: 'aai-validation-settings'