From 31dba4884145f075125e30782c8f2e8e77eb83d9 Mon Sep 17 00:00:00 2001 From: Jessica Wagantall Date: Tue, 13 Feb 2018 11:53:08 -0800 Subject: Remove empty java-version in templates The new upgrade of global-jjb 0.16.0 is able to handle the java version better. We do not need to set this variable as empty anymore. Change-Id: I88cae9f4b49241b6045deee7fd696c18d781db1c Issue-ID: CIMAN-126 Signed-off-by: Jessica Wagantall --- jjb/ccsdk/dashboard.yaml | 2 -- jjb/ccsdk/distribution.yaml | 2 -- jjb/ccsdk/parent.yaml | 1 - jjb/ccsdk/platform-nbapi.yaml | 2 -- jjb/ccsdk/platform-plugins.yaml | 2 -- jjb/ccsdk/sli-adaptors.yaml | 2 -- jjb/ccsdk/sli-core.yaml | 2 -- jjb/ccsdk/sli-northbound.yaml | 2 -- jjb/ccsdk/sli-plugins.yaml | 2 -- jjb/ccsdk/storage-pgaas.yaml | 2 -- jjb/ccsdk/utils.yaml | 1 - 11 files changed, 20 deletions(-) (limited to 'jjb/ccsdk') diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 08ec0f21e..6189533f7 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-dashboard' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -25,7 +24,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/dashboard' project-name: 'ccsdk-dashboard' branch: 'master' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index fe4a84037..c7dd5e179 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-distribution' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/distribution' project-name: 'ccsdk-distribution' branch: 'master' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index ac8024c1c..28e12b4ac 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-parent' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' diff --git a/jjb/ccsdk/platform-nbapi.yaml b/jjb/ccsdk/platform-nbapi.yaml index 405daa63d..d506beb86 100644 --- a/jjb/ccsdk/platform-nbapi.yaml +++ b/jjb/ccsdk/platform-nbapi.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-platform-nbapi' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/platform/nbapi' project-name: 'ccsdk-platform-nbapi' branch: 'master' diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 846340988..90d9c29e8 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-platform-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -26,7 +25,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/platform/plugins' project-name: 'ccsdk-platform-plugins' branch: 'master' diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 88f69e736..33d5fbf4d 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-adaptors' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/adaptors' project-name: 'ccsdk-sli-adaptors' branch: 'master' diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 1de8575cb..2b2492332 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-core' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/core' project-name: 'ccsdk-sli-core' branch: 'master' diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index deb124618..a0fc16867 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-northbound' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -29,7 +28,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/northbound' project-name: 'ccsdk-sli-northbound' branch: 'master' diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 8a81e3485..918760646 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-sli-plugins' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/sli/plugins' project-name: 'ccsdk-sli-plugins' branch: 'master' diff --git a/jjb/ccsdk/storage-pgaas.yaml b/jjb/ccsdk/storage-pgaas.yaml index a5c06f137..7e1e8a1f4 100644 --- a/jjb/ccsdk/storage-pgaas.yaml +++ b/jjb/ccsdk/storage-pgaas.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-storage-pgaas' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -28,7 +27,6 @@ jobs: - gerrit-maven-sonar build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'ccsdk/storage/pgaas' project-name: 'ccsdk-storage-pgaas' branch: 'master' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 26d7b002e..6da9f41fa 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -4,7 +4,6 @@ project-name: 'ccsdk-utils' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' -- cgit 1.2.3-korg