From d1a3fff64af00c3ce0717ae9f00da86e63d87f86 Mon Sep 17 00:00:00 2001 From: Kevin Sandi Date: Tue, 6 Dec 2022 14:59:46 -0600 Subject: [PATCH] CI: remove unsupported Jenkins jobs streams from ccsdk Issue-ID: CIMAN-33 Signed-off-by: Kevin Sandi Change-Id: I206e8261649f6f38681d1f72386cce99ffbf7478 --- jjb/ccsdk/apps.yaml | 2 -- jjb/ccsdk/ccsdk-csit.yaml | 4 --- jjb/ccsdk/ccsdk-oran.yaml | 2 -- jjb/ccsdk/cds.yaml | 70 ++++++++++++++++++++++----------------------- jjb/ccsdk/distribution.yaml | 2 -- jjb/ccsdk/features.yaml | 2 -- jjb/ccsdk/parent.yaml | 4 --- jjb/ccsdk/sli.yaml | 2 -- 8 files changed, 34 insertions(+), 54 deletions(-) diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index a6b231dfa..47285c81d 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -34,8 +34,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 2c107a9ef..bfebf74e4 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': @@ -40,8 +38,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index e64229123..452c7aef8 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -28,8 +28,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 2d78144f6..a0447dbb6 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -27,8 +27,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': @@ -47,44 +45,44 @@ mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' -- project: - name: ccsdk-cds-java8 - project-name: 'ccsdk-cds' - jobs: - - gerrit-maven-verify: - mvn-params: '-Ddocker.skip.push=true -P docker' - - gerrit-maven-merge: - cron: '@daily' - mvn-params: '-Ddocker.skip.push=true -P docker' - - gerrit-maven-stage: - build-node: centos8-builder-4c-4g - sign-artifacts: true - mvn-params: '-Dmaven.test.skip=true' - cron: '' - - gerrit-maven-docker-stage: - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - maven-versions-plugin: true - cron: '@daily' +#- project: +# name: ccsdk-cds-java8 +# project-name: 'ccsdk-cds' +# jobs: +# - gerrit-maven-verify: +# mvn-params: '-Ddocker.skip.push=true -P docker' +# - gerrit-maven-merge: +# cron: '@daily' +# mvn-params: '-Ddocker.skip.push=true -P docker' +# - gerrit-maven-stage: +# build-node: centos8-builder-4c-4g +# sign-artifacts: true +# mvn-params: '-Dmaven.test.skip=true' +# cron: '' +# - gerrit-maven-docker-stage: +# container-public-registry: 'nexus3.onap.org:10001' +# container-staging-registry: 'nexus3.onap.org:10003' +# mvn-params: '-Dmaven.test.skip=true -P docker' +# maven-versions-plugin: true +# cron: '@daily' - project: 'ccsdk/cds' - stream: - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk8 - mvn-version: 'mvn38' - mvn-settings: 'ccsdk-cds-settings' +# project: 'ccsdk/cds' +# stream: +# - 'frankfurt': +# branch: 'frankfurt' +# java-version: openjdk8 +# mvn-version: 'mvn38' +# mvn-settings: 'ccsdk-cds-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: centos7-docker-8c-8g - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' +# maven-deploy-properties: | +# deployAtEnd=true +# files: '**' +# archive-artifacts: '' +# build-node: centos7-docker-8c-8g +# mvn-snapshot-id: 'ecomp-snapshots' +# nexus-snapshot-repo: 'snapshots' - project: name: ccsdk-cds-sonar diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 51039a60e..195c9e93e 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -29,8 +29,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index cc8cfdb5f..0694a87dd 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -21,8 +21,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index c095d7c3d..30900fed7 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -32,10 +32,6 @@ mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0' - '{project-name}-gerrit-release-jobs': mvn-params: '-Drevision=3.0.0' - - 'honolulu': - branch: 'honolulu' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 9a3b4d5aa..212cbe32e 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -21,8 +21,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - 'jakarta': branch: 'jakarta' - 'kohn': -- 2.16.6