From c9886b473fd00f6251bd9a04c9f26c3af998e417 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 19 Oct 2018 18:26:36 -0700 Subject: [PATCH] SO-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: I6bd7db60496fcbfdd52993959c9b080cabe1b8a9 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/so/so-libs.yaml | 10 +++++++++- jjb/so/so.yaml | 11 ++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 2ec6a80a1..6714fea8d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -3,7 +3,6 @@ name: so-libs project-name: 'so-libs' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -34,3 +33,12 @@ mvn-settings: 'so-libs-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-libs-clm + jobs: + - gerrit-maven-clm + project: so/libs + project-name: 'so-libs' + branch: 'master' + mvn-settings: 'so-libs-settings' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 67681c458..1af2778b0 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -4,7 +4,6 @@ name: so project-name: 'so' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -35,3 +34,13 @@ mvn-settings: 'so-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: so-clm + jobs: + - gerrit-maven-clm + project: so + project-name: 'so' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'so-settings' -- 2.16.6