From 66af885dad8fe6ce0e5987b6a6dca4069ecdf40f Mon Sep 17 00:00:00 2001 From: Vijay Venkatesh Kumar Date: Tue, 9 May 2023 22:05:20 +0000 Subject: Switch dcae jobs to london rls branch Replace kohn jobs to london Change-Id: I374462005da31054ad004b213d003480351c736c Signed-off-by: Vijay Venkatesh Kumar Issue-ID: DCAEGEN2-3360 --- 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 ++-- 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 | 4 ++-- 20 files changed, 48 insertions(+), 48 deletions(-) diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 1f236def3..817eead0e 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 497247981..33c1702aa 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,8 +6,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 6cc45f024..fbf007d5d 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" # 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 6bd87dea6..8e4db3c6a 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -23,8 +23,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 c6dba0522..ee5554050 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -8,8 +8,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 1a34e67fd..22f7f2234 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -26,8 +26,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 f7836e173..0b83a6e88 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -14,8 +14,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" mvn-settings: "dcaegen2-deployments-settings" mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index 56da81a8a..f226ac889 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 9279e2e38..0b091d6a0 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" java-version: openjdk11 maven-version: "mvn35" mvn-settings: "dcaegen2-services-settings" @@ -51,8 +51,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" java-version: openjdk11 gerrit_trigger_file_paths: - compare-type: ANT @@ -86,8 +86,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" java-version: openjdk11 gerrit_trigger_file_paths: - compare-type: ANT @@ -121,8 +121,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 20967d1d8..53b6869fe 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -87,8 +87,8 @@ stream: - master: branch: master - - kohn: - branch: kohn + - london: + branch: london jobs: - "{project-name}-docker-python-jobs" @@ -104,8 +104,8 @@ stream: - master: branch: master - - kohn: - branch: kohn + - london: + branch: london jobs: - "{project-name}-docker-python-jobs" diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index f7f66bb87..e6021065d 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -12,8 +12,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 7cbb68be3..dbc88e873 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 2fd7f915c..66b3dd281 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -24,8 +24,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 13a3bb8e0..5a19b82ca 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 efb8dc136..690ce8279 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -22,8 +22,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 88b7775d2..f09b7476a 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -18,8 +18,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 f822ab652..8b8e86284 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 e80dd9dbb..b92c173fd 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" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 e87c0774d..4b583e845 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -14,8 +14,8 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "london": + branch: "london" 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 0ce5531e6..dfd1f02f5 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -17,10 +17,10 @@ stream: - "master": branch: "master" + - "london": + branch: "london" - "kohn": branch: "kohn" - - "jakarta": - branch: "jakarta" mvn-snapshot-id: "ecomp-snapshots" nexus-snapshot-repo: "snapshots" mvn-settings: "dcaegen2-settings" -- cgit 1.2.3-korg