Skip to content

WIP: Plz don't review, check the load field issue on Jenkins #2715

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
wants to merge 2 commits into
base: cnv-4.20
Choose a base branch
from
+1 −11
Open

WIP: Plz don't review, check the load field issue on Jenkins #2715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54ea28a
Virt remove 67104
SiboWang1997 Nov 18, 2025
0a29c69
Test windows-2016 images on jenkines
SiboWang1997 Nov 21, 2025
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
10 changes: 0 additions & 10 deletions tests/virt/cluster/common_templates/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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")
2 changes: 1 addition & 1 deletion utilities/os_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
},
Expand Down