From cd274478e52197ddaf04d8a138c0dfe9b6b654ba Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Fri, 19 Oct 2018 18:45:37 -0700 Subject: VNFSDK-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: I8061cddf7d77c7eab1f243f6960ac15a5248a974 Issue-ID: CIMAN-213 Signed-off-by: Jessica Wagantall --- jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml | 11 ++++++++++- jjb/vnfsdk/vnfsdk-functest.yaml | 11 ++++++++++- jjb/vnfsdk/vnfsdk-ice-python.yaml | 11 ++++++++++- jjb/vnfsdk/vnfsdk-refrepo.yaml | 11 ++++++++++- jjb/vnfsdk/vnfsdk-validation.yaml | 11 ++++++++++- jjb/vnfsdk/vnfsdk-ves-agent.yaml | 13 +++++++++++-- 6 files changed, 61 insertions(+), 7 deletions(-) (limited to 'jjb') diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index a169794e4..e64ff60c9 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -17,7 +17,6 @@ mvn-settings: 'vnfsdk-dovetail-integration-settings' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{subproject}-python-staging-{stream}' @@ -47,3 +46,13 @@ project: 'vnfsdk/dovetail-integration' project-name: 'vnfsdk-dovetail-integration' branch: 'master' + +- project: + name: vnfsdk-dovetail-integration-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/dovetail-integration + project-name: 'vnfsdk-dovetail-integration' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-dovetail-integration-settings' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index d83b42d89..74416e830 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -3,7 +3,6 @@ name: vnfsdk-functest project-name: 'vnfsdk-functest' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -37,3 +36,13 @@ project: 'vnfsdk/functest' project-name: 'vnfsdk-functest' branch: 'master' + +- project: + name: vnfsdk-functest-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/functest + project-name: 'vnfsdk-functest' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-functest-settings' diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml index 0b064052c..16ebadc94 100644 --- a/jjb/vnfsdk/vnfsdk-ice-python.yaml +++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml @@ -24,7 +24,6 @@ mvn-settings: 'vnfsdk-ice-settings' build-node: ubuntu1604-builder-4c-4g jobs: - - gerrit-maven-clm - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{subproject}-python-staging-{stream}' @@ -74,3 +73,13 @@ mvn-settings: 'vnfsdk-ice-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vnfsdk-ice-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/ice + project-name: 'vnfsdk-ice' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-ice-settings' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index e30be0458..ceb5e2abc 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -3,7 +3,6 @@ name: vnfsdk-refrepo project-name: 'vnfsdk-refrepo' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -44,3 +43,13 @@ project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' + +- project: + name: vnfsdk-refrepo-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/refrepo + project-name: 'vnfsdk-refrepo' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-refrepo-settings' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 2a4a03999..377c2d512 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -3,7 +3,6 @@ name: vnfsdk-validation project-name: 'vnfsdk-validation' 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 @@ project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' + +- project: + name: vnfsdk-validation-clm + jobs: + - gerrit-maven-clm + project: vnfsdk/validation + project-name: 'vnfsdk-validation' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-validation-settings' diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index ee9ec08dd..d4f2895c0 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -7,8 +7,6 @@ pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' pattern: 'veslibrary/**' jobs: - - gerrit-maven-clm: - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-verify-java': mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - '{project-name}-{stream}-{subproject}-verify-java' @@ -44,3 +42,14 @@ project: 'vnfsdk/ves-agent' project-name: 'vnfsdk-ves-agent' branch: 'master' + +- project: + name: vnfsdk-ves-agent-clm + jobs: + - gerrit-maven-clm: + mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' + project: vnfsdk/ves-agent + project-name: 'vnfsdk-ves-agent' + build-node: ubuntu1604-builder-4c-4g + branch: 'master' + mvn-settings: 'vnfsdk-ves-agent-settings' -- cgit 1.2.3-korg