Skip to content

Fix VM preference resolution in downward metrics fixture #4016

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
aditi-sharma-1 wants to merge 2 commits into
base: main
Choose a base branch
from
+8 −1
Open

Fix VM preference resolution in downward metrics fixture #4016

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e51249c
Update preference for downward metrics
aditi-sharma-1 Mar 1, 2026
872ac18
Merge branch 'RedHatQE:main' into s390x-downward-metrics-preference
aditi-sharma-1 Apr 22, 2026
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
9 changes: 8 additions & 1 deletion tests/infrastructure/vhostmd/test_downwardmetrics_virtio.py
View file
Open in desktop
Copy link
Copy Markdown
Contributor

@RoniKishner RoniKishner Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using preferred_preference_for_rhel_version you can try using vm_preference_infer=True in the VM creation.
It should automatically assign the preference according to arch, but this needs validation

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@
)
from pyhelper_utils.shell import run_ssh_commands

from utilities.constants import OS_FLAVOR_RHEL
from utilities.architecture import get_cluster_architecture
from utilities.constants import OS_FLAVOR_RHEL, S390X
from utilities.hco import ResourceEditorValidateHCOReconcile
from utilities.virt import VirtualMachineForTests, wait_for_running_vm

Expand Down Expand Up @@ -128,6 +129,12 @@ def preferred_cluster_instance_type(unprivileged_client):
@pytest.fixture()
def preferred_preference_for_rhel_version(rhel_version, unprivileged_client):
preference_name = re.sub(r"(\D+)(\d+)", r"\1.\2", rhel_version)
if get_cluster_architecture() == S390X:
Copy link
Copy Markdown
Collaborator

@rnetser rnetser Mar 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use get_cluster_architecture fixture

preference_object = VirtualMachineClusterPreference(
Copy link
Copy Markdown
Contributor

@geetikakay geetikakay Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe

if get_cluster_architecture() == S390X:
preference_name = f"{preference_name}.{S390X}"

preference_object = VirtualMachineClusterPreference(name=preference_name, client=unprivileged_client)

name=f"{preference_name}.{S390X}", client=unprivileged_client
)
if preference_object.exists:
return preference_object
preference_object = VirtualMachineClusterPreference(name=preference_name, client=unprivileged_client)
if preference_object.exists:
return preference_object
Expand Down