Merge branch 'main' into testCustomCliDownload

OhadRevah · web-flow · commit 302457173a67 · 2025-10-15T10:45:30.000+03:00
diff --git a/.github/workflows/request-coderabbit-test-instructions.yml b/.github/workflows/request-coderabbit-test-instructions.yml
@@ -31,6 +31,7 @@ jobs:
         uses: peter-evans/create-or-update-comment@v4
         with:
           issue-number: ${{ github.event.pull_request.number }}
+          token: ${{ secrets.BOT3_TOKEN }}
           body: |
             @coderabbitai
             <details>
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
         stages: [pre-commit]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.2
+    rev: v0.13.3
     hooks:
       - id: ruff
         stages: [pre-commit]
diff --git a/tests/chaos/migration/test_migration.py b/tests/chaos/migration/test_migration.py
@@ -31,6 +31,7 @@
 ]
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.parametrize(
     "pod_deleting_process",
@@ -84,6 +85,7 @@ def test_pod_delete_migration(
     )
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.parametrize(
     "chaos_worker_background_process",
@@ -135,6 +137,7 @@ def test_stress_migration_target_node(
     )
 
 
+@pytest.mark.s390x
 @pytest.mark.parametrize(
     "chaos_dv_rhel9, pod_deleting_process",
     [
@@ -196,6 +199,7 @@ def test_pod_delete_storage_migration(
     ), "The VMI has not been migrated to a different node."
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.parametrize(
     "chaos_worker_background_process",
@@ -249,6 +253,7 @@ def test_stress_migration_source_node(
     reason=(f"{QUARANTINED}: Failed on teardown with kubernetes.client.exceptions.ApiException. Tracked in CNV-62939"),
     run=False,
 )
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.polarion("CNV-6120")
 def test_migration_reboot_source_node(
diff --git a/tests/chaos/snapshot/test_snapshot.py b/tests/chaos/snapshot/test_snapshot.py
@@ -17,6 +17,7 @@
 ]
 
 
+@pytest.mark.s390x
 @pytest.mark.parametrize(
     "pod_deleting_process, chaos_online_snapshots",
     [
diff --git a/tests/chaos/standard/test_standard.py b/tests/chaos/standard/test_standard.py
@@ -19,6 +19,7 @@
 ]
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.parametrize(
     "chaos_vms_list_rhel9, pod_deleting_process",
@@ -53,6 +54,7 @@ def test_pod_delete_openshift_apiserver(
         running_vm(vm=vm, wait_for_interfaces=False, check_ssh_connectivity=False)
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.parametrize(
     "rebooted_control_plane_node",
@@ -85,6 +87,7 @@ def test_control_plane_node_restart(
         running_vm(vm=vm, wait_for_interfaces=False, check_ssh_connectivity=False)
 
 
+@pytest.mark.s390x
 @pytest.mark.parametrize(
     "chaos_dv_rhel9, downscaled_storage_provisioner_deployment",
     [
@@ -116,6 +119,7 @@ def test_odf_storage_outage(
     chaos_vm_rhel9_with_dv.wait_for_specific_status(status=VirtualMachine.Status.RUNNING, timeout=TIMEOUT_2MIN)
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.parametrize(
     "chaos_worker_background_process",
@@ -152,6 +156,7 @@ def test_host_io_stress(
     assert chaos_worker_background_process.exitcode == 0, "Background process execution failed"
 
 
+@pytest.mark.s390x
 @pytest.mark.gpfs
 @pytest.mark.usefixtures("deleted_pod_by_name_prefix")
 @pytest.mark.parametrize("chaos_vms_instancetype_list", [pytest.param({"number_of_vms": 3})], indirect=True)
diff --git a/tests/install_upgrade_operators/relationship_labels/test_relationship_labels.py b/tests/install_upgrade_operators/relationship_labels/test_relationship_labels.py
@@ -12,8 +12,7 @@
 from tests.install_upgrade_operators.relationship_labels.utils import (
     verify_component_labels_by_resource,
 )
-from utilities.constants import KUBEVIRT_APISERVER_PROXY_NP, VERSION_LABEL_KEY
-from utilities.infra import is_jira_open
+from utilities.constants import VERSION_LABEL_KEY
 
 pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x]
 LOGGER = logging.getLogger(__name__)
@@ -100,9 +99,6 @@ def test_verify_relationship_labels_hco_components(
         expected_label_dictionary,
         ocp_resource_by_name,
     ):
-        if ocp_resource_by_name.name == KUBEVIRT_APISERVER_PROXY_NP and is_jira_open(jira_id="CNV-68999"):
-            pytest.skip(f"Currently {KUBEVIRT_APISERVER_PROXY_NP} resource have the wrong relationship labels")
-
         verify_component_labels_by_resource(
             component=ocp_resource_by_name,
             expected_component_labels=expected_label_dictionary,
diff --git a/tests/install_upgrade_operators/utils.py b/tests/install_upgrade_operators/utils.py
@@ -147,7 +147,7 @@ def wait_for_spec_change(expected, get_spec_func, base_path):
     samplers = TimeoutSampler(
         wait_timeout=TIMEOUT_1MIN,
         sleep=TIMEOUT_5SEC,
-        func=lambda: benedict(get_spec_func()),
+        func=lambda: benedict(get_spec_func(), keypath_separator=KEY_PATH_SEPARATOR),
     )
     current_value = None
     try:
diff --git a/tests/storage/cdi_upload/test_upload.py b/tests/storage/cdi_upload/test_upload.py
@@ -24,7 +24,6 @@
 from tests.os_params import RHEL_LATEST
 from utilities.constants import (
     CDI_UPLOADPROXY,
-    QUARANTINED,
     TIMEOUT_1MIN,
     TIMEOUT_3MIN,
     TIMEOUT_5MIN,
@@ -182,10 +181,6 @@ def test_successful_upload_with_supported_formats(
             check_disk_count_in_vm(vm=vm_dv)
 
 
-@pytest.mark.xfail(
-    reason=f"{QUARANTINED}: Flaky test, timeout failure; CNV-67422",
-    run=False,
-)
 @pytest.mark.parametrize(
     "data_volume_multi_storage_scope_function",
     [
@@ -202,7 +197,6 @@ def test_successful_upload_with_supported_formats(
     indirect=True,
 )
 @pytest.mark.sno
-@pytest.mark.gating
 @pytest.mark.polarion("CNV-2018")
 @pytest.mark.s390x
 def test_successful_upload_token_validity(
@@ -226,16 +220,7 @@ def test_successful_upload_token_validity(
     ) as utr:
         token = utr.create().status.token
         wait_for_upload_response_code(token=token, data=upload_file_path, response_code=HTTP_OK)
-        dv.wait_for_condition(
-            condition=DataVolume.Condition.Type.RUNNING,
-            status=DataVolume.Condition.Status.TRUE,
-            timeout=TIMEOUT_5MIN,
-        )
-        dv.wait_for_condition(
-            condition=DataVolume.Condition.Type.READY,
-            status=DataVolume.Condition.Status.TRUE,
-            timeout=TIMEOUT_5MIN,
-        )
+        dv.wait_for_dv_success()
 
 
 @pytest.mark.parametrize(
diff --git a/tests/storage/test_hotplug.py b/tests/storage/test_hotplug.py
@@ -25,6 +25,7 @@
     migrate_vm_and_verify,
     running_vm,
     vm_instance_from_template,
+    wait_for_ssh_connectivity,
     wait_for_windows_vm,
 )
 
@@ -174,6 +175,7 @@ def test_hotplug_volume_with_serial(
         hotplug_volume_scope_class,
     ):
         wait_for_vm_volume_ready(vm=fedora_vm_for_hotplug_scope_class)
+        wait_for_ssh_connectivity(vm=fedora_vm_for_hotplug_scope_class)
         assert_disk_serial(vm=fedora_vm_for_hotplug_scope_class)
 
     @pytest.mark.polarion("CNV-11389")
diff --git a/tests/virt/OWNERS b/tests/virt/OWNERS
@@ -9,3 +9,4 @@ reviewers:
   - SiboWang1997
   - akri3i
   - jerry7z
+  - SamAlber
diff --git a/tests/virt/cluster/common_templates/utils.py b/tests/virt/cluster/common_templates/utils.py
@@ -3,6 +3,7 @@
 import re
 import shlex
 from datetime import datetime, timedelta, timezone
+from functools import cache
 from typing import Generator, Optional
 
 import bitmath
@@ -28,6 +29,7 @@
 from utilities.infra import (
     get_linux_guest_agent_version,
     get_linux_os_info,
+    is_jira_open,
     raise_multiple_exceptions,
     run_virtctl_command,
 )
@@ -65,6 +67,9 @@ 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)
@@ -649,3 +654,8 @@ 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/tests/virt/node/descheduler/utils.py b/tests/virt/node/descheduler/utils.py
@@ -4,7 +4,6 @@
 
 from ocp_resources.deployment import Deployment
 from ocp_resources.kube_descheduler import KubeDescheduler
-from ocp_resources.resource import ResourceEditor
 from ocp_resources.virtual_machine import VirtualMachine
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
@@ -13,7 +12,6 @@
     DESCHEDULER_SOFT_TAINT_KEY,
     DESCHEDULING_INTERVAL_120SEC,
 )
-from tests.virt.utils import is_jira_67515_open
 from utilities.constants import (
     TIMEOUT_1MIN,
     TIMEOUT_5MIN,
@@ -233,9 +231,7 @@ def deploy_vms(
         vm.delete()
 
     for vm in vms:
-        # Due to the bug - VM may hang in terminating state, need to remove the finalizer from VMI
-        if not vm.wait_deleted() and is_jira_67515_open():
-            ResourceEditor(patches={vm.vmi: {"metadata": {"finalizers": []}}}).update()
+        vm.wait_deleted()
 
 
 def verify_at_least_one_vm_migrated(vms, node_before):
diff --git a/tests/virt/node/log_verbosity/test_log_virt_launcher.py b/tests/virt/node/log_verbosity/test_log_virt_launcher.py
@@ -3,11 +3,9 @@
 import pytest
 from timeout_sampler import TimeoutExpiredError, TimeoutSampler
 
-from tests.utils import clean_up_migration_jobs
 from tests.virt.node.log_verbosity.constants import (
     VIRT_LOG_VERBOSITY_LEVEL_6,
 )
-from tests.virt.utils import is_jira_67515_open
 from utilities.constants import MIGRATION_POLICY_VM_LABEL, TIMEOUT_1MIN, TIMEOUT_5SEC
 from utilities.virt import (
     VirtualMachineForTests,
@@ -67,7 +65,6 @@ def wait_for_all_progress_keys_in_pod_log(pod):
 @pytest.fixture(scope="class")
 def vm_for_migration_progress_test(
     namespace,
-    admin_client,
     unprivileged_client,
     cpu_for_migration,
 ):
@@ -81,9 +78,6 @@ def vm_for_migration_progress_test(
     ) as vm:
         running_vm(vm=vm)
         yield vm
-        # Due to the bug - migration job should be removed before stopping the VM
-        if is_jira_67515_open():
-            clean_up_migration_jobs(client=admin_client, vm=vm)
 
 
 @pytest.fixture()
diff --git a/tests/virt/utils.py b/tests/virt/utils.py
@@ -4,7 +4,6 @@
 import re
 import shlex
 from contextlib import contextmanager
-from functools import cache
 from typing import Any, Generator
 
 import bitmath
@@ -46,7 +45,6 @@
     update_hco_annotations,
     wait_for_hco_conditions,
 )
-from utilities.infra import is_jira_open
 from utilities.storage import (
     create_dv,
     create_or_update_data_source,
@@ -494,11 +492,6 @@ def verify_linux_boot_time(vm_list, initial_boot_time):
     assert not rebooted_vms, f"Boot time changed for VMs:\n {rebooted_vms}"
 
 
-@cache
-def is_jira_67515_open():
-    return is_jira_open(jira_id="CNV-67515")
-
-
 def get_or_create_golden_image_data_source(
     admin_client: DynamicClient, golden_images_namespace: Namespace, os_dict: dict[str, Any]
 ) -> Generator[DataSource, None, None]:
diff --git a/uv.lock b/uv.lock

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@`
`31`	`31`	`]`
`32`	`32`
`33`	`33`
	`34`	`+@pytest.mark.s390x`
`34`	`35`	`@pytest.mark.gpfs`
`35`	`36`	`@pytest.mark.parametrize(`
`36`	`37`	`"pod_deleting_process",`
`@@ -84,6 +85,7 @@ def test_pod_delete_migration(`
`84`	`85`	`)`
`85`	`86`
`86`	`87`
	`88`	`+@pytest.mark.s390x`
`87`	`89`	`@pytest.mark.gpfs`
`88`	`90`	`@pytest.mark.parametrize(`
`89`	`91`	`"chaos_worker_background_process",`
`@@ -135,6 +137,7 @@ def test_stress_migration_target_node(`
`135`	`137`	`)`
`136`	`138`
`137`	`139`
	`140`	`+@pytest.mark.s390x`
`138`	`141`	`@pytest.mark.parametrize(`
`139`	`142`	`"chaos_dv_rhel9, pod_deleting_process",`
`140`	`143`	`[`
`@@ -196,6 +199,7 @@ def test_pod_delete_storage_migration(`
`196`	`199`	`), "The VMI has not been migrated to a different node."`
`197`	`200`
`198`	`201`
	`202`	`+@pytest.mark.s390x`
`199`	`203`	`@pytest.mark.gpfs`
`200`	`204`	`@pytest.mark.parametrize(`
`201`	`205`	`"chaos_worker_background_process",`
`@@ -249,6 +253,7 @@ def test_stress_migration_source_node(`
`249`	`253`	`reason=(f"{QUARANTINED}: Failed on teardown with kubernetes.client.exceptions.ApiException. Tracked in CNV-62939"),`
`250`	`254`	`run=False,`
`251`	`255`	`)`
	`256`	`+@pytest.mark.s390x`
`252`	`257`	`@pytest.mark.gpfs`
`253`	`258`	`@pytest.mark.polarion("CNV-6120")`
`254`	`259`	`def test_migration_reboot_source_node(`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`]`
`18`	`18`
`19`	`19`
	`20`	`+@pytest.mark.s390x`
`20`	`21`	`@pytest.mark.parametrize(`
`21`	`22`	`"pod_deleting_process, chaos_online_snapshots",`
`22`	`23`	`[`
Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ def wait_for_spec_change(expected, get_spec_func, base_path):`
`147`	`147`	`samplers = TimeoutSampler(`
`148`	`148`	`wait_timeout=TIMEOUT_1MIN,`
`149`	`149`	`sleep=TIMEOUT_5SEC,`
`150`		`- func=lambda: benedict(get_spec_func()),`
	`150`	`+ func=lambda: benedict(get_spec_func(), keypath_separator=KEY_PATH_SEPARATOR),`
`151`	`151`	`)`
`152`	`152`	`current_value = None`
`153`	`153`	`try:`