From 507031a14877a56f7ad8e766efe58e36686df82d Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 19 Oct 2018 16:03:55 -0700 Subject: HOLMES-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: I52ea3a5daf583e1a2c65dec819637ad4657d3a7c Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/holmes/holmes-common.yaml | 10 +++++++++- jjb/holmes/holmes-dsa.yaml | 10 +++++++++- jjb/holmes/holmes-engine-mgt.yaml | 10 +++++++++- jjb/holmes/holmes-rule-mgt.yaml | 10 +++++++++- 4 files changed, 36 insertions(+), 4 deletions(-) (limited to 'jjb/holmes') diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 9d7f34be1..559f1d577 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -3,7 +3,6 @@ name: holmes-common project-name: 'holmes-common' 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: 'holmes-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-common-clm + jobs: + - gerrit-maven-clm + project: holmes/common + project-name: 'holmes-common' + branch: 'master' + mvn-settings: 'holmes-common-settings' diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index 8a014be81..79b4fe663 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -3,7 +3,6 @@ name: holmes-dsa project-name: 'holmes-dsa' 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: 'holmes-dsa-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-dsa-clm + jobs: + - gerrit-maven-clm + project: holmes/dsa + project-name: 'holmes-dsa' + branch: 'master' + mvn-settings: 'holmes-dsa-settings' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index cd4e71c4e..77888cc15 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -3,7 +3,6 @@ name: holmes-engine-management project-name: 'holmes-engine-management' 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: 'holmes-engine-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-engine-management-clm + jobs: + - gerrit-maven-clm + project: holmes/engine-management + project-name: 'holmes-engine-management' + branch: 'master' + mvn-settings: 'holmes-engine-management-settings' diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index ee7815856..42d14daca 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -3,7 +3,6 @@ name: holmes-rule-management project-name: 'holmes-rule-management' 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: 'holmes-rule-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: holmes-rule-management-clm + jobs: + - gerrit-maven-clm + project: holmes/rule-management + project-name: 'holmes-rule-management' + branch: 'master' + mvn-settings: 'holmes-rule-management-settings' -- cgit 1.2.3-korg