AAF-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: Ib273ae89f672603306104bb43cbfd422e11bf0f8
Issue-ID: CIMAN-213
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 047e668..a4568a1 100644 (file)
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -3,7 +3,6 @@
     name: aaf-authz
     project-name: 'aaf-authz'
     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: 'aaf-authz-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: aaf-authz-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aaf/authz'
+    project-name: 'aaf-authz'
+    branch: 'master'
+    mvn-settings: 'aaf-authz-settings'

diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 336001e..0ef86c0 100644 (file)
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -3,7 +3,6 @@
     name: aaf-cadi
     project-name: 'aaf-cadi'
     jobs:
-      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -104,3 +103,12 @@
     mvn-settings: 'aaf-cadi-settings'
     files: '**'
     archive-artifacts: ''
+
+- project:
+    name: aaf-cadi-clm
+    jobs:
+      - gerrit-maven-clm
+    project: 'aaf/cadi'
+    project-name: 'aaf-cadi'
+    branch: 'master'
+    mvn-settings: 'aaf-cadi-settings'

diff --git a/jjb/aaf/aaf-luaplugin.yaml b/jjb/aaf/aaf-luaplugin.yaml
index a4c514a..9853e52 100644 (file)
--- a/jjb/aaf/aaf-luaplugin.yaml
+++ b/jjb/aaf/aaf-luaplugin.yaml
@@ -1,13 +1,9 @@
 ---
 - project:
-    name: aaf-luaplugin
+    name: aaf-luaplugin-clm
     project-name: 'aaf-luaplugin'
     jobs:
       - gerrit-maven-clm
     project: 'aaf/luaplugin'
-    stream:
-      - 'master':
-          branch: 'master'
+    branch: 'master'
     mvn-settings: 'aaf-luaplugin-settings'
-    files: '**'
-    archive-artifacts: ''