From 6a7010b674773fef4223b9a8577348039fb32b00 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Thu, 18 Oct 2018 22:03:23 -0700 Subject: [PATCH] CCSDK-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: Ief5e40b3f01cb545e800bb0899019a2da564b40b Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/ccsdk/apps.yaml | 11 ++++++++++- jjb/ccsdk/distribution.yaml | 12 +++++++++++- jjb/ccsdk/features.yaml | 11 ++++++++++- jjb/ccsdk/parent.yaml | 12 +++++++++++- jjb/ccsdk/platform-plugins.yaml | 12 +++++++++++- jjb/ccsdk/sli-adaptors.yaml | 12 +++++++++++- jjb/ccsdk/sli-core.yaml | 13 ++++++++++++- jjb/ccsdk/sli-northbound.yaml | 12 +++++++++++- jjb/ccsdk/sli-plugins.yaml | 12 +++++++++++- jjb/ccsdk/utils.yaml | 11 ++++++++++- 10 files changed, 108 insertions(+), 10 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index a63bb8dff..2b183bc73 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -3,7 +3,6 @@ name: ccsdk-apps project-name: 'ccsdk-apps' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -37,6 +36,16 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: ccsdk-apps-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/apps' + project-name: 'ccsdk-apps' + branch: 'master' + mvn-settings: 'ccsdk-apps-settings' + build-node: ubuntu1604-builder-4c-4g + - project: name: ccsdk-apps-docker project-name: 'ccsdk-apps' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index af8f12592..ebedf9a01 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -3,7 +3,6 @@ name: ccsdk-distribution project-name: 'ccsdk-distribution' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -38,3 +37,14 @@ docker-pom: 'pom.xml' mvn-profile: docker build-node: queue-docker-4c-4g + +- project: + name: ccsdk-distribution-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/distribution' + project-name: 'ccsdk-distribution' + branch: 'master' + mvn-settings: 'ccsdk-distribution-settings' + build-node: ubuntu1604-docker-8c-8g + diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 4aa05b17e..9c36c8ed4 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -3,7 +3,6 @@ name: ccsdk-features project-name: 'ccsdk-features' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,13 @@ mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-features-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/features' + project-name: 'ccsdk-features' + branch: 'master' + mvn-settings: 'ccsdk-features-settings' + build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 3d50184bb..3edf720fa 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -3,7 +3,6 @@ name: ccsdk-parent project-name: 'ccsdk-parent' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,14 @@ deployAtEnd=true files: '**' archive-artifacts: '' + +- project: + name: ccsdk-parent-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/parent' + project-name: 'ccsdk-parent' + branch: 'master' + mvn-settings: 'ccsdk-parent-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 9d6a1aecf..aeb79a6d3 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -3,7 +3,6 @@ name: ccsdk-platform-plugins project-name: 'ccsdk-platform-plugins' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,14 @@ mvn-settings: 'ccsdk-platform-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-platform-plugins-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/platform/plugins' + project-name: 'ccsdk-platform-plugins' + branch: 'master' + mvn-settings: 'ccsdk-platform-plugins-settings' + build-node: centos7-redis-4c-4g + diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 3ef1af8c1..d2a85f3ef 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-adaptors project-name: 'ccsdk-sli-adaptors' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,14 @@ mvn-settings: 'ccsdk-sli-adaptors-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-adaptors-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/adaptors' + project-name: 'ccsdk-sli-adaptors' + branch: 'master' + mvn-settings: 'ccsdk-sli-adaptors-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 82e15527f..c2192c0b4 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-core project-name: 'ccsdk-sli-core' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -23,6 +22,7 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + - project: name: ccsdk-sli-core-sonar jobs: @@ -35,3 +35,14 @@ mvn-settings: 'ccsdk-sli-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-core-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/core' + project-name: 'ccsdk-sli-core' + branch: 'master' + mvn-settings: 'ccsdk-sli-core-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 26d8372b9..ff932d42a 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-northbound project-name: 'ccsdk-sli-northbound' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -36,3 +35,14 @@ mvn-settings: 'ccsdk-sli-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-northbound-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/northbound' + project-name: 'ccsdk-sli-northbound' + branch: 'master' + mvn-settings: 'ccsdk-sli-northbound-settings' + build-node: ubuntu1604-builder-4c-4g + diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index d95f60fd3..e0e81047f 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -3,7 +3,6 @@ name: ccsdk-sli-plugins project-name: 'ccsdk-sli-plugins' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,6 +21,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + - project: name: ccsdk-sli-plugins-sonar jobs: @@ -34,3 +34,13 @@ mvn-settings: 'ccsdk-sli-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-plugins-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/sli/plugins' + project-name: 'ccsdk-sli-plugins' + branch: 'master' + mvn-settings: 'ccsdk-sli-plugins-settings' + diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index f1498551a..1ad5b1ac8 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -3,7 +3,6 @@ name: ccsdk-utils project-name: 'ccsdk-utils' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,3 +21,13 @@ deployAtEnd=true files: '**' archive-artifacts: '' + +- project: + name: ccsdk-utils-clm + jobs: + - gerrit-maven-clm + project: 'ccsdk/utils' + project-name: 'ccsdk-utils' + branch: 'master' + mvn-settings: 'ccsdk-utils-settings' + -- 2.16.6