APPC-Refactor CLM project block

The clm job portion needs to be on its own
project section similar to the Sonar portion.

The reason behind this, is because we only want
this job to be running for master and no other
branches. Also, this is in preparation for the
work that is to come from global-jjb on application
names in CLM.

Change-Id: I45642f6f3c14acd047141d3b8f74113c0674c54a
Issue-ID: CIMAN-213
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml
index be7e1f7..c610857 100644 (file)
--- a/jjb/appc/appc-cdt.yaml
+++ b/jjb/appc/appc-cdt.yaml
@@ -3,7 +3,6 @@
     name: appc-cdt
     project-name: 'appc-cdt'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -16,3 +15,13 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
+- project:
+    name: appc-cdt-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'appc/cdt'
+    project-name: 'appc-cdt'
+    branch: 'master'
+    mvn-settings: 'appc-cdt-settings'
+

diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml
index a863e6e..fc4567a 100644 (file)
--- a/jjb/appc/appc-deployment.yaml
+++ b/jjb/appc/appc-deployment.yaml
@@ -4,7 +4,6 @@
     name: appc-deployment
     project-name: 'appc-deployment'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -39,3 +38,13 @@
     docker-pom: 'pom.xml'
     mvn-profile: docker
     build-node: queue-docker-4c-4g
+
+- project:
+    name: appc-deployment-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'appc/deployment'
+    project-name: 'appc-deployment'
+    branch: 'master'
+    mvn-settings: 'appc-deployment-settings'
+

diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml
index ed973ec..1fdba4d 100644 (file)
--- a/jjb/appc/appc-master.yaml
+++ b/jjb/appc/appc-master.yaml
@@ -3,10 +3,6 @@
     name: appc-master
     project-name: 'appc'
     jobs:
-      - gerrit-maven-clm:
-          mvn-params: '-DskipTests'
-          build-timeout: 30
-          build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-verify-java':
           build-node: ubuntu1604-builder-8c-8g
       - '{project-name}-{stream}-merge-java':
@@ -35,3 +31,15 @@
     mvn-settings: 'appc-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx4096m'
+
+- project:
+    name: appc-clm
+    jobs:
+      - gerrit-maven-clm:
+          mvn-params: '-DskipTests'
+          build-timeout: 30
+          build-node: ubuntu1604-builder-8c-8g
+    project: 'appc'
+    project-name: 'appc'
+    branch: 'master'
+    mvn-settings: 'appc-settings'