From cb0f4ae4e5bdede5dec4c79de2670a7e33410355 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 19 Oct 2018 18:30:11 -0700 Subject: [PATCH] USECASE-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: Ifb6705a0c932581e65346c9c0d201af7daff13ee Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/usecaseui/usecase-ui-server.yaml | 11 ++++++++++- jjb/usecaseui/usecase-ui.yaml | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index e469c609e..5818f80b3 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -9,7 +9,6 @@ branch: 'master' mvn-settings: 'usecase-ui-server-settings' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -33,3 +32,13 @@ mvn-settings: 'usecase-ui-server-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: usecase-ui-server-clm + jobs: + - gerrit-maven-clm + project: usecase-ui/server + project-name: 'usecase-ui-server' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'usecase-ui-server-settings' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 894be9103..33a7814ba 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -9,7 +9,6 @@ branch: 'master' mvn-settings: 'usecase-ui-settings' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -20,3 +19,13 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1604-builder-4c-4g + +- project: + name: usecase-ui-clm + jobs: + - gerrit-maven-clm + project: usecase-ui + project-name: 'usecase-ui' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'usecase-ui-settings' -- 2.16.6