diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml index 79a672d17..daaf15fd6 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml @@ -358,6 +358,16 @@ data: status_serverbundles = [item for item in status_serverbundles if item.get('bundleType') != 'foundation'] if status_serverbundles and spec_serverbundles: + import re + + def remove_user_sync_target(bundles): + return [{k: v for k, v in b.items() if k != 'isUserSyncTarget'} for b in bundles] + + mas_app_channel = os.getenv("MAS_APP_CHANNEL", "") + match = re.match(r'^(\d+)\.(\d+)', mas_app_channel) + if match and (int(match.group(1)), int(match.group(2))) >= (9, 1): + spec_serverbundles = remove_user_sync_target(spec_serverbundles) + status_serverbundles = remove_user_sync_target(status_serverbundles) assert spec_serverbundles == status_serverbundles, f"Expected serverbundles set in the spec: {spec_serverbundles} to be equal to the serverbundles in the status: {status_serverbundles}" #This is actual Test case method to ping AI service from Manage with retryable attempts @@ -506,6 +516,8 @@ spec: value: "{{ .Values.instance_id }}" - name: MAS_WORKSPACE_ID value: "{{ .Values.mas_workspace_id }}" + - name: MAS_APP_CHANNEL + value: "{{ .Values.mas_app_channel }}" - name: TEST_RECORD_CM value: "{{ $record_cm_name }}" {{- if and (hasKey .Values "global_secrets") (hasKey .Values.global_secrets "mxe.int.aibrokerapikey") }} diff --git a/instance-applications/510-550-ibm-mas-suite-app-config/values.yaml b/instance-applications/510-550-ibm-mas-suite-app-config/values.yaml index eb988a281..36d85685c 100644 --- a/instance-applications/510-550-ibm-mas-suite-app-config/values.yaml +++ b/instance-applications/510-550-ibm-mas-suite-app-config/values.yaml @@ -33,6 +33,12 @@ run_sanity_test: false # tls_key: "" +# #################################################### +# # Required iff mas_app_id is "manage" +# #################################################### + +# mas_app_channel: "9.2.x-stable" + # #################################################### # # Required iff mas_app_id is "manage" or "health" # #################################################### 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 9e79fb4d0..0a997ba01 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 @@ -88,7 +88,9 @@ spec: mas_app_ws_apiversion: "{{ $value.mas_app_ws_apiversion }}" mas_app_ws_kind: "{{ $value.mas_app_ws_kind }}" mas_appws_spec: {{ $value.mas_appws_spec | toYaml | nindent 14 }} - + {{- if (eq $value.mas_app_id "manage") }} + mas_app_channel: "{{ $.Values.ibm_suite_app_manage_install.mas_app_channel }}" + {{- end }} mas_manual_cert_mgmt: {{ $value.mas_manual_cert_mgmt }} run_sanity_test: {{ $value.run_sanity_test }} {{- if $value.mas_manual_cert_mgmt }}