From a391d109008e7163163212d4cbb9b078dea8bc93 Mon Sep 17 00:00:00 2001 From: Andrew Whitfield Date: Sat, 28 Sep 2024 19:20:41 +0100 Subject: [PATCH] [patch] Decrease prefix name of juniutreporter (#206) --- .../templates/510-550-ibm-mas-masapp-configs.yaml | 2 +- .../510-ibm-mas-masapp-visualinspection-install.yaml | 2 +- .../junitreporter/templates/00-presync-report-starter.yaml | 2 +- .../junitreporter/templates/10-postsync-report-starter.yaml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml index 3edd6fc14..0e6cb862a 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml @@ -94,7 +94,7 @@ spec: {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-config-{{ $value.mas_app_id }}-{{ $value.mas_workspace_id }}" + reporter_name: "ibm-mas-suite-app-config-{{ $value.mas_app_id }}" cluster_id: "{{ $.Values.cluster.id }}" devops_mongo_uri: "{{ $.Values.devops.mongo_uri }}" devops_build_number: "{{ $.Values.devops.build_number }}" diff --git a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml index 33a9f5e69..87c79be01 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-visualinspection-install.yaml @@ -61,7 +61,7 @@ spec: {{- end }} gpu_request_quota: "{{ .Values.ibm_suite_app_visualinspection_install.gpu_request_quota }}" junitreporter: - reporter_name: "ibm-mas-suite-app-install-visualinspection" + reporter_name: "ibm-mas-suite-app-install-mvi" cluster_id: "{{ .Values.cluster.id }}" devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" devops_build_number: "{{ .Values.devops.build_number }}" diff --git a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml index 836866701..531fd121f 100644 --- a/sub-charts/junitreporter/templates/00-presync-report-starter.yaml +++ b/sub-charts/junitreporter/templates/00-presync-report-starter.yaml @@ -1,7 +1,7 @@ {{- if .Values.devops_mongo_uri }} -{{ $prefix := printf "pre-junitreporter-%s" .Values.reporter_name }} +{{ $prefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $secret := printf "%s-devopsuri" $prefix }} {{ $role_name := printf "%s-role" $prefix }} {{ $rb_name := printf "%s-rb" $prefix }} diff --git a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml index 402a3776c..25aee93ab 100644 --- a/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml +++ b/sub-charts/junitreporter/templates/10-postsync-report-starter.yaml @@ -1,10 +1,10 @@ {{- if .Values.devops_mongo_uri }} -{{ $preprefix := printf "pre-junitreporter-%s" .Values.reporter_name }} +{{ $preprefix := printf "pre-jreporter-%s" .Values.reporter_name }} {{ $time_cm := printf "%s-synctime" $preprefix }} -{{ $prefix := printf "post-junitreporter-%s" .Values.reporter_name }} +{{ $prefix := printf "post-jreporter-%s" .Values.reporter_name }} {{ $role_name := printf "%s-role" $prefix }} {{ $rb_name := printf "%s-rb" $prefix }} {{ $sa_name := printf "%s-sa" $prefix }}