diff --git a/tests/virt/cluster/common_templates/utils.py b/tests/virt/cluster/common_templates/utils.py index 4073062c5..2c4a50108 100644 --- a/tests/virt/cluster/common_templates/utils.py +++ b/tests/virt/cluster/common_templates/utils.py @@ -3,7 +3,6 @@ import re import shlex from datetime import datetime, timedelta, timezone -from functools import cache from typing import Generator, Optional import bitmath @@ -29,7 +28,6 @@ from utilities.infra import ( get_linux_guest_agent_version, get_linux_os_info, - is_jira_open, raise_multiple_exceptions, run_virtctl_command, ) @@ -66,9 +64,6 @@ def _get_os_info(vm): cnv_info = get_cnv_os_info(vm=vm) libvirt_info = get_libvirt_os_info(vm=vm) linux_info = get_linux_os_info(ssh_exec=vm.ssh_exec) - if is_jira_70401_bug_open(): - virtctl_info.pop("load", None) - cnv_info.pop("load", None) return virtctl_info, cnv_info, libvirt_info, linux_info os_info_sampler = TimeoutSampler(wait_timeout=330, sleep=30, func=_get_os_info, vm=vm) @@ -661,8 +656,3 @@ def matrix_os_vm_from_template( data_volume_template=data_volume_template, vm_dict=param_dict.get("vm_dict"), ) - - -@cache -def is_jira_70401_bug_open(): - return is_jira_open(jira_id="CNV-70401") diff --git a/utilities/os_utils.py b/utilities/os_utils.py index 7d435d772..d7e692fb3 100644 --- a/utilities/os_utils.py +++ b/utilities/os_utils.py @@ -84,7 +84,7 @@ def get_windows_container_disk_path(os_value: str) -> str: IMAGE_NAME_STR: "WIN2k16_IMG", OS_VERSION_STR: "2016", OS_STR: WIN_2K16, - "uefi": True, + # "uefi": True, DATA_SOURCE_STR: WIN_2K16, CONTAINER_DISK_IMAGE_PATH_STR: get_windows_container_disk_path(os_value=WIN_2K16), },