summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-18 21:59:04 -0700
committerJessica Wagantall <jwagantall@linuxfoundation.org>2018-10-23 15:10:18 -0700
commit584add827782fbf4e60d26fd262d3b4ad2f5c8a7 (patch)
tree183731e29bac8d935c59f281c5a231da85d7d1f9
parentf8baafc7eb1cd75e9e31534d24a8e911cc85626c (diff)
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>
-rw-r--r--jjb/aaf/aaf-authz.yaml10
-rw-r--r--jjb/aaf/aaf-cadi.yaml10
-rw-r--r--jjb/aaf/aaf-luaplugin.yaml8
3 files changed, 20 insertions, 8 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 047e66837..a4568a1f9 100644
--- 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 336001e14..0ef86c0c2 100644
--- 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 a4c514ab7..9853e52d3 100644
--- 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: ''