From c1e11d289682926cbf35ee47a6d72d697089f7fc Mon Sep 17 00:00:00 2001 From: vv770d Date: Mon, 25 Apr 2022 18:21:38 +0000 Subject: [DCAE] Enable CI jobs for jakarta branch Change-Id: Ib0141e22fe35a6b8d2294f1bba048c442e70db82 Signed-off-by: vv770d Issue-ID: DCAEGEN2-2973 --- 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 | 4 ++-- .../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 | 2 ++ 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 | 6 ++---- jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 4 ++-- jjb/dcaegen2/dcaegen2-utils.yaml | 4 ++-- jjb/dcaegen2/dcaegen2.yaml | 4 ++-- 25 files changed, 57 insertions(+), 55 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 6623edd6d..d56a6e4bd 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -25,8 +25,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' 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 59e4bf7f1..3def2f3fc 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -8,8 +8,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' 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 5778cb5e4..af4910897 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -8,8 +8,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' # 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 31c2a677e..9c6d8cfe2 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -24,8 +24,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dcaegen2-collectors-restconf-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-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 799fd7842..a253c125e 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -10,8 +10,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' 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 7fa8ef5f1..b37d40c5f 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -25,8 +25,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' 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 1421ef0f0..6345f73b3 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -14,8 +14,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dcaegen2-deployments-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-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 369e6f489..bb4cd6c48 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -97,8 +97,8 @@ branch: master - istanbul: branch: istanbul - - honolulu: - branch: honolulu + - jakarta: + branch: jakarta views: - project-view: diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml index fc8539cc4..59c73129a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -17,8 +17,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index b5af55841..2787f50f2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -15,10 +15,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: dcaegen2-platform-settings files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml index 299c04208..d4e41d6e2 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml @@ -15,10 +15,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: dcaegen2-platform-settings files: '**' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml index 684074684..a34faf317 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml @@ -24,7 +24,9 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + - 'jakarta': + branch: 'jakarta' + java-version: openjdk11 mvn-settings: dcaegen2-platform-settings maven-version: 'mvn35' maven-deploy-properties: | diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 2fd96bd34..864176006 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -22,10 +22,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dcaegen2-platform-ves-openapi-manager-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-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 837e17de0..e7b05d21d 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -15,8 +15,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 maven-version: 'mvn35' mvn-settings: 'dcaegen2-services-settings' @@ -50,8 +50,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | @@ -84,8 +84,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' maven-deploy-properties: | @@ -118,8 +118,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' 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 0c52baec4..9eb155bce 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -109,6 +109,8 @@ branch: master - istanbul: branch: istanbul + - jakarta: + branch: jakarta 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 82ee02506..cb616bf1b 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' 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 3308f7e52..232a499ec 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' 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 31a6bc5ce..dd6dab7d1 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -22,10 +22,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dcaegen2-services-mapper-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 409e5f81b..7b544602c 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -6,10 +6,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' 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 013524415..5399481c2 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -20,10 +20,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'dcaegen2-services-prh-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index 7f437580b..1e61d4a8b 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -16,10 +16,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'dcaegen2-services-sdk-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index d6956ca28..e040b7266 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' @@ -47,8 +47,6 @@ stream: - 'master': branch: 'master' - - 'guilin': - branch: 'guilin' java-version: openjdk11 mvn-settings: 'dcaegen2-services-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index d6b9c7619..2b0e443fb 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -21,10 +21,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'dcaegen2-services-son-handler-settings' files: '**' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 624f74dd1..fca7af29b 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -13,10 +13,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'dcaegen2-utils-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.yaml b/jjb/dcaegen2/dcaegen2.yaml index cf65da2a4..46c501ef6 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,8 +17,8 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' + - 'jakarta': + branch: 'jakarta' - 'istanbul': branch: 'istanbul' mvn-settings: 'dcaegen2-settings' -- cgit 1.2.3-korg