From 5b1dbabddc04a08ca23d4f67de57dd065c03abc4 Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Tue, 11 Oct 2022 15:30:48 +0000 Subject: [PATCH] [DCAE] Add Kohn branch and cleanup older branches Remove jakarta branch with exception of dcaegen2 (doc) repo. Change-Id: I219f232188f0cfcb9203f27ab236cd14d4ac6cc6 Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-3236 Signed-off-by: Vijay Venkatesh Kumar --- jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-datafile.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-restconf.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-deployments.yaml | 6 ++---- .../dcaegen2-platform-docker-python-subprojects.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 16 ++++++++-------- .../dcaegen2-services-docker-python-subprojects.yaml | 8 ++++---- jjb/dcaegen2/dcaegen2-services-heartbeat.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-mapper.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-prh.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-sdk.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-utils.yaml | 4 ++-- jjb/dcaegen2/dcaegen2.yaml | 2 ++ 25 files changed, 58 insertions(+), 58 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 4599e94d6..54a29429a 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -25,8 +25,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-version: 'mvn35' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index 510befec2..4a62b4d14 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 # apply to all jobs project: 'dcaegen2/collectors/datafile' diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index bef9324fb..c7e79bda7 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' # apply to all jobs java-version: openjdk11 project: 'dcaegen2/collectors/hv-ves' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 54e9b3f81..25814ac96 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -23,8 +23,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' mvn-settings: 'dcaegen2-collectors-restconf-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 911be77a3..8442817dc 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-collectors-snmptrap-settings' jobs: diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 1e551bfd5..cf39afede 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -26,8 +26,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: 'dcaegen2-collectors-ves-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index b9af660c2..b03484612 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -14,10 +14,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: 'dcaegen2-deployments-settings' mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 7adbfdd48..bb70341ac 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -96,8 +96,8 @@ stream: - master: branch: master - - jakarta: - branch: jakarta + - kohn: + branch: kohn views: - project-view: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index 3d43a02ed..0920ead5f 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: dcaegen2-platform-settings container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index bbc237faf..a47fe524a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: dcaegen2-platform-settings container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index 7de568b18..d458fb737 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: dcaegen2-platform-settings gerrit_trigger_file_paths: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml index 57b3ed5b7..bff0e0129 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml @@ -19,8 +19,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: dcaegen2-platform-settings gerrit_trigger_file_paths: diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 65dc423f6..6ca3f3dae 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 691d54f38..f843ba6e0 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -10,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 maven-version: 'mvn35' mvn-settings: 'dcaegen2-services-settings' @@ -51,8 +51,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 gerrit_trigger_file_paths: - compare-type: ANT @@ -86,8 +86,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 gerrit_trigger_file_paths: - compare-type: ANT @@ -121,8 +121,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 6947e123f..6cd4efab4 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -78,8 +78,8 @@ DNAME={container-snapshot-registry}/{docker-name} docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 docker push $DNAME:$DOCKER_IMAGE_TAG2 - stream: jakarta - branch: jakarta + stream: kohn + branch: kohn cron: '' - gerrit-whitesource-scan: build-timeout: 120 @@ -108,8 +108,8 @@ stream: - master: branch: master - - jakarta: - branch: jakarta + - kohn: + branch: kohn views: - project-view: project-name: dcaegen2-services-pmsh diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index 7ac291829..f4a5f11f0 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -12,8 +12,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: 'dcaegen2-services-heartbeat-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index 103e77dbd..c8ec26269 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -10,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index b0d647072..eed6c2a54 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: 'dcaegen2-services-mapper-settings' mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index d42888b76..f78c82ba4 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 # apply to all jobs project: 'dcaegen2/services/pm-mapper' diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 8efc860c1..9c2249160 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-services-prh-settings' mvn-snapshot-id: 'ecomp-snapshots' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index e381d8bcb..f31a6b9c0 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-services-sdk-settings' mvn-snapshot-id: 'ecomp-snapshots' diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index 5023f77e9..ae922dcf0 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -10,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index 4f751c50e..14ebeb3cd 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -22,8 +22,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' java-version: openjdk11 mvn-settings: 'dcaegen2-services-son-handler-settings' mvn-snapshot-id: 'ecomp-snapshots' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 4cecd41da..f8275af2f 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -14,8 +14,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' mvn-settings: 'dcaegen2-utils-settings' mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index e47a14594..e2d70f204 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'kohn': + branch: 'kohn' - 'jakarta': branch: 'jakarta' mvn-settings: 'dcaegen2-settings' -- 2.16.6