From c39e326b368239a337510926026a334abd951efa Mon Sep 17 00:00:00 2001 From: whitfiea Date: Thu, 28 Nov 2024 13:51:36 +0000 Subject: [PATCH] [patch] Add instance id to instance level reporters --- .../ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml | 2 +- .../ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml | 2 +- .../ibm-mas-instance-root/templates/100-ibm-sls-app.yaml | 2 +- .../ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml | 2 +- .../templates/110-ibm-cp4d-operator-app.yaml | 2 +- .../ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml | 2 +- .../ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml | 2 +- .../templates/120-ibm-aiopenscale-app.yaml | 2 +- .../ibm-mas-instance-root/templates/120-ibm-spark-app.yaml | 2 +- .../ibm-mas-instance-root/templates/120-ibm-spss-app.yaml | 2 +- .../ibm-mas-instance-root/templates/120-ibm-wml-app.yaml | 2 +- .../ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml | 2 +- .../ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml | 2 +- .../templates/130-ibm-mas-suite-configs-app.yaml | 2 +- .../ibm-mas-instance-root/templates/200-ibm-mas-workspaces.yaml | 2 +- .../templates/500-ibm-mas-masapp-manage-install.yaml | 2 +- .../templates/510-550-ibm-mas-masapp-configs.yaml | 2 +- .../templates/510-ibm-mas-masapp-assist-install.yaml | 2 +- .../templates/510-ibm-mas-masapp-iot-install.yaml | 2 +- .../templates/510-ibm-mas-masapp-visualinspection-install.yaml | 2 +- .../templates/520-ibm-mas-masapp-health-install.yaml | 2 +- .../templates/520-ibm-mas-masapp-monitor-install.yaml | 2 +- .../templates/520-ibm-mas-masapp-optimizer-install.yaml | 2 +- .../templates/540-ibm-mas-masapp-predict-install.yaml | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml b/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml index ad7910415..9873f026e 100644 --- a/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml +++ b/root-applications/ibm-mas-instance-root/templates/000-ibm-sync-resources.yaml @@ -84,7 +84,7 @@ spec: {{- end }} junitreporter: - reporter_name: "ibm-sync-resources" + reporter_name: "ibm-sync-resources-{{ .Values.instance.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/010-ibm-sync-jobs.yaml b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml index a92dbef91..dbdc9fdcf 100644 --- a/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml +++ b/root-applications/ibm-mas-instance-root/templates/010-ibm-sync-jobs.yaml @@ -91,7 +91,7 @@ spec: {{- end }} junitreporter: - reporter_name: "ibm-sync-jobs" + reporter_name: "ibm-sync-jobs-{{ .Values.instance.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/100-ibm-sls-app.yaml b/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml index 8315095be..9f8d2489f 100644 --- a/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/100-ibm-sls-app.yaml @@ -59,7 +59,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-sls" + reporter_name: "ibm-sls-{{ .Values.instance.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/110-ibm-cp4d-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml index 7547da6d1..cfa236287 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-app.yaml @@ -97,7 +97,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-cp4d" + reporter_name: "ibm-cp4d-{{ .Values.instance.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/110-ibm-cp4d-operator-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml index 1ceeb665e..5960814c6 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cp4d-operator-app.yaml @@ -89,7 +89,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-cp4d-operator" + reporter_name: "ibm-cp4d-operator-{{ .Values.instance.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/110-ibm-cs-control-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml index 4f41eb311..b7f909cde 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-cs-control-app.yaml @@ -88,7 +88,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-cs-control" + reporter_name: "ibm-cs-control-{{ .Values.instance.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/110-ibm-db2u-app.yaml b/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml index 537db9762..b277800b4 100644 --- a/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/110-ibm-db2u-app.yaml @@ -43,7 +43,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-db2u" + reporter_name: "ibm-db2u-{{ .Values.instance.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/120-ibm-aiopenscale-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml index c1624a28a..7c2375b9c 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-aiopenscale-app.yaml @@ -47,7 +47,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-aiopenscale" + reporter_name: "ibm-aiopenscale-{{ .Values.instance.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/120-ibm-spark-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml index 31548ed2f..b52121af2 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-spark-app.yaml @@ -51,7 +51,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-spark" + reporter_name: "ibm-spark-{{ .Values.instance.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/120-ibm-spss-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml index e8fde2526..0b78eff81 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-spss-app.yaml @@ -55,7 +55,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-spss" + reporter_name: "ibm-spss-{{ .Values.instance.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/120-ibm-wml-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml index 2e02c69c0..3338e599d 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-wml-app.yaml @@ -52,7 +52,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-wml" + reporter_name: "ibm-wml-{{ .Values.instance.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/120-ibm-wsl-app.yaml b/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml index 5987d8da3..c6634633a 100644 --- a/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/120-ibm-wsl-app.yaml @@ -55,7 +55,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-wsl" + reporter_name: "ibm-wsl-{{ .Values.instance.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/130-ibm-mas-suite-app.yaml b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml index 88433e948..b49b1720c 100644 --- a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-app.yaml @@ -113,7 +113,7 @@ spec: {{- end }} junitreporter: - reporter_name: "ibm-mas-suite" + reporter_name: "ibm-mas-suite-{{ .Values.instance.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/130-ibm-mas-suite-configs-app.yaml b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-configs-app.yaml index 8ea080c1d..5b402e3ff 100644 --- a/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-configs-app.yaml +++ b/root-applications/ibm-mas-instance-root/templates/130-ibm-mas-suite-configs-app.yaml @@ -55,7 +55,7 @@ spec: {{- end }} {{ $value | toYaml | nindent 12 }} junitreporter: - reporter_name: "{{ $value.mas_config_chart }}" + reporter_name: "{{ $value.mas_config_chart }}-{{ $.Values.instance.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/200-ibm-mas-workspaces.yaml b/root-applications/ibm-mas-instance-root/templates/200-ibm-mas-workspaces.yaml index f5e5dffb7..830b8a8f0 100644 --- a/root-applications/ibm-mas-instance-root/templates/200-ibm-mas-workspaces.yaml +++ b/root-applications/ibm-mas-instance-root/templates/200-ibm-mas-workspaces.yaml @@ -46,7 +46,7 @@ spec: custom_labels: {{ $.Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-workspace-{{ $value.mas_workspace_id }}" + reporter_name: "ibm-mas-ws-{{ $.Values.instance.id }}-{{ $value.mas_workspace_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/500-ibm-mas-masapp-manage-install.yaml b/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml index 7cfc6ee63..323d550f4 100644 --- a/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/500-ibm-mas-masapp-manage-install.yaml @@ -61,7 +61,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-manage" + reporter_name: "app-install-manage-{{ .Values.instance.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-550-ibm-mas-masapp-configs.yaml b/root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml index bc91caffb..7755b541a 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 }}" + reporter_name: "app-config-{{ $value.mas_app_id }}-{{ $.Values.instance.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-assist-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml index b84583936..ce1c6de12 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-assist-install.yaml @@ -60,7 +60,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-assist" + reporter_name: "app-install-assist-{{ .Values.instance.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-iot-install.yaml b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml index 4c930ee78..550854973 100644 --- a/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/510-ibm-mas-masapp-iot-install.yaml @@ -61,7 +61,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-iot" + reporter_name: "app-install-iot-{{ .Values.instance.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 97c372579..828572b94 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 @@ -65,7 +65,7 @@ spec: storage_class_definitions: {{ .Values.ibm_suite_app_visualinspection_install.storage_class_definitions | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-mvi" + reporter_name: "app-install-mvi-{{ .Values.instance.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/520-ibm-mas-masapp-health-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml index 981d7226d..7adf44650 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-health-install.yaml @@ -61,7 +61,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-health" + reporter_name: "app-install-health-{{ .Values.instance.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/520-ibm-mas-masapp-monitor-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml index e066b88b0..5c311fdb0 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-monitor-install.yaml @@ -61,7 +61,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-monitor" + reporter_name: "app-install-monitor-{{ .Values.instance.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/520-ibm-mas-masapp-optimizer-install.yaml b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml index c8b3f34fa..8b0202d1d 100644 --- a/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/520-ibm-mas-masapp-optimizer-install.yaml @@ -61,7 +61,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-optimizer" + reporter_name: "app-install-optimizer-{{ .Values.instance.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/540-ibm-mas-masapp-predict-install.yaml b/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml index 6ce9bd6de..ea26cd656 100644 --- a/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml +++ b/root-applications/ibm-mas-instance-root/templates/540-ibm-mas-masapp-predict-install.yaml @@ -61,7 +61,7 @@ spec: custom_labels: {{ .Values.custom_labels | toYaml | nindent 14 }} {{- end }} junitreporter: - reporter_name: "ibm-mas-suite-app-install-predict" + reporter_name: "app-install-predict-{{ .Values.instance.id }}" cluster_id: "{{ .Values.cluster.id }}" devops_mongo_uri: "{{ .Values.devops.mongo_uri }}" devops_build_number: "{{ .Values.devops.build_number }}"