Merge "MUSIC-Refactor CLM project block"

4 files changed, 38 insertions, 6 deletions

diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml
index 457042a6c..6f83f0fd3 100644
--- a/jjb/music/music-jar.yaml
+++ b/jjb/music/music-jar.yaml
@@ -7,8 +7,6 @@
           pom: 'jar/pom.xml'
           pattern: 'jar/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f jar/pom.xml'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
     project: 'music'
@@ -24,3 +22,13 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: music-jar-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f jar/pom.xml'
+    project: music
+    project-name: 'music-jar'
+    branch: 'master'
+    mvn-settings: 'music-settings'
diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml
index 3e2031a17..1e48b35ae 100644
--- a/jjb/music/music-prom.yaml
+++ b/jjb/music/music-prom.yaml
@@ -3,7 +3,6 @@
     name: music-prom
     project-name: 'music-prom'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -20,3 +19,12 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: music-prom-clm
+    jobs:
+      - gerrit-maven-clm
+    project: music/prom
+    project-name: 'music-prom'
+    branch: 'master'
+    mvn-settings: 'music-prom-settings'
diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml
index aa52bec61..bf33832d9 100644
--- a/jjb/music/music-trigger.yaml
+++ b/jjb/music/music-trigger.yaml
@@ -7,8 +7,6 @@
           pom: 'musictrigger/pom.xml'
           pattern: 'musictrigger/**'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-f musictrigger/pom.xml assembly:single'
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
     project: 'music'
@@ -20,3 +18,13 @@
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
 
+
+- project:
+    name: music-trigger-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-f musictrigger/pom.xml assembly:single'
+    project: music
+    project-name: 'music-trigger'
+    branch: 'master'
+    mvn-settings: 'music-settings'
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 2fe2702e5..43fe66524 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -3,7 +3,6 @@
     name: music
     project-name: 'music'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -35,3 +34,12 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+
+- project:
+    name: music-clm
+    jobs:
+      - gerrit-maven-clm
+    project: music
+    project-name: 'music'
+    branch: 'master'
+    mvn-settings: 'music-settings'