Skip to content

MASCORE-15348: Skip isUserSyncTarget validation in test_bundle_sizes for MAS >= 9.1 #557

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Raahithyaj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

MASCORE-15348: Skip isUserSyncTarget validation in test_bundle_sizes for MAS >= 9.1 #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions ...ce-applications/510-550-ibm-mas-suite-app-config/templates/04-postsync-manage-verify.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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") }}
Expand Down
6 changes: 6 additions & 0 deletions instance-applications/510-550-ibm-mas-suite-app-config/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,12 @@ run_sanity_test: false
# tls_key: "<base64-encoded PEM>"


# ####################################################
# # Required iff mas_app_id is "manage"
# ####################################################

# mas_app_channel: "9.2.x-stable"

# ####################################################
# # Required iff mas_app_id is "manage" or "health"
# ####################################################
Expand Down
4 changes: 3 additions & 1 deletion root-applications/ibm-mas-instance-root/templates/510-550-ibm-mas-masapp-configs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading