Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

libs/infra/images.py

@@ -17,6 +17,7 @@ class Cirros:
     DIR: str = f"{BASE_IMAGES_DIR}/cirros-images"
     DEFAULT_DV_SIZE: str = "1Gi"
     DEFAULT_MEMORY_SIZE: str = "64M"
+    OS_FLAVOR: str = "cirros"
 
 
 @dataclass

tests/conftest.py

@@ -460,11 +460,21 @@ def cnv_tests_utilities_namespace(admin_client, installing_cnv):
     if installing_cnv:
         yield
     else:
-        yield from create_ns(
-            admin_client=admin_client,
-            labels=POD_SECURITY_NAMESPACE_LABELS,
-            name="cnv-tests-utilities",
-        )
+        name = "cnv-tests-utilities"
+        if Namespace(client=admin_client, name=name).exists:
+            exit_pytest_execution(
+                message=f"{name} namespace already exists."
+                f"\nAfter verifying no one else is performing tests against the cluster, run:"
+                f"\n'oc delete namespace {name}'",
+                return_code=100,
+            )
+
+        else:
+            yield from create_ns(
+                admin_client=admin_client,
+                labels=POD_SECURITY_NAMESPACE_LABELS,
+                name=name,
+            )
 
 
 @pytest.fixture(scope="session")

tests/global_config_s390x.py

@@ -11,12 +11,17 @@
 
 global config
 
-# TODO: remove once CIRROS is replaced
-utilities.constants.OS_FLAVOR_CIRROS = "fedora"
+
 EXPECTED_CLUSTER_INSTANCE_TYPE_LABELS[PREFERENCE_STR] = f"rhel.9.{S390X}"
 
-rhel_os_matrix = generate_os_matrix_dict(os_name="rhel", supported_operating_systems=["rhel-9-5"])
-fedora_os_matrix = generate_os_matrix_dict(os_name="fedora", supported_operating_systems=["fedora-41"])
+rhel_os_matrix = generate_os_matrix_dict(
+    os_name="rhel",
+    supported_operating_systems=[
+        "rhel-8-10",
+        "rhel-9-6",
+    ],
+)
+fedora_os_matrix = generate_os_matrix_dict(os_name="fedora", supported_operating_systems=["fedora-42"])
 centos_os_matrix = generate_os_matrix_dict(os_name="centos", supported_operating_systems=["centos-stream-9"])
 
 instance_type_rhel_os_matrix = generate_linux_instance_type_os_matrix(

tests/network/conftest.py

@@ -326,7 +326,7 @@ def _verify_bgp_env_vars():
         EXTERNAL_FRR_STATIC_IPV4: reserved IP in CIDR format for the external FRR pod inside
                                   PRIMARY_NODE_NETWORK_VLAN_TAG network.
         """
-        if any(test.get_closest_marker("bgp") for test in collected_tests):
+        if any(test.get_closest_marker("bgp") and not test.get_closest_marker("xfail") for test in collected_tests):
             LOGGER.info("Verifying if the cluster supports running BGP tests...")
             required_env_vars = [
                 "PRIMARY_NODE_NETWORK_VLAN_TAG",

tests/network/l2_bridge/test_l2_ovs_linux_bridge.py

@@ -7,7 +7,7 @@
 from timeout_sampler import TimeoutSampler
 
 from tests.network.libs.dhcpd import DHCP_IP_RANGE_START
-from utilities.constants import TIMEOUT_2MIN
+from utilities.constants import QUARANTINED, TIMEOUT_2MIN
 from utilities.network import assert_ping_successful, get_vmi_ip_v4_by_name, ping
 
 LOGGER = logging.getLogger(__name__)
@@ -73,10 +73,13 @@ def test_dhcp_broadcast(
         l2_bridge_running_vm_b,
         configured_l2_bridge_vm_a,
         started_vmb_dhcp_client,
+        request,
     ):
         """
         Test broadcast traffic via L2 linux bridge. VM_A has dhcp server installed. VM_B dhcp client.
         """
+        if "ovs-bridge" in request.node.name:
+            pytest.xfail(reason=f"{QUARANTINED}: Test is flaky over OVS bridge, tracked in CNV-70028")
         current_ip = TimeoutSampler(
             wait_timeout=TIMEOUT_2MIN,
             sleep=2,

tests/storage/cdi_clone/test_clone.py

@@ -13,7 +13,6 @@
     create_windows_vm_validate_guest_agent_info,
 )
 from utilities.constants import (
-    OS_FLAVOR_CIRROS,
     OS_FLAVOR_FEDORA,
     OS_FLAVOR_WINDOWS,
     TIMEOUT_1MIN,
@@ -48,7 +47,7 @@ def create_vm_from_clone_dv_template(
     with VirtualMachineForTests(
         name=vm_name,
         namespace=namespace_name,
-        os_flavor=OS_FLAVOR_CIRROS,
+        os_flavor=Images.Cirros.OS_FLAVOR,
         client=client,
         memory_guest=Images.Cirros.DEFAULT_MEMORY_SIZE,
         data_volume_template=data_volume_template_dict(

tests/storage/cdi_upload/test_upload.py

@@ -24,6 +24,7 @@
 from tests.os_params import RHEL_LATEST
 from utilities.constants import (
     CDI_UPLOADPROXY,
+    QUARANTINED,
     TIMEOUT_1MIN,
     TIMEOUT_3MIN,
     TIMEOUT_5MIN,
@@ -181,6 +182,10 @@ 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",
     [

tests/storage/cdi_upload/test_upload_virtctl.py

@@ -19,7 +19,7 @@
     assert_use_populator,
     create_vm_and_verify_image_permission,
 )
-from utilities.constants import CDI_UPLOADPROXY, OS_FLAVOR_CIRROS, TIMEOUT_1MIN, Images
+from utilities.constants import CDI_UPLOADPROXY, TIMEOUT_1MIN, Images
 from utilities.storage import (
     ErrorMsg,
     check_disk_count_in_vm,
@@ -335,7 +335,7 @@ def test_virtctl_image_upload_with_exist_pvc(
             with VirtualMachineForTests(
                 name="cnv-3727-vm",
                 namespace=empty_pvc.namespace,
-                os_flavor=OS_FLAVOR_CIRROS,
+                os_flavor=Images.Cirros.OS_FLAVOR,
                 memory_guest=Images.Cirros.DEFAULT_MEMORY_SIZE,
                 pvc=empty_pvc,
             ) as vm:

tests/storage/conftest.py

@@ -43,7 +43,6 @@
     CDI_UPLOADPROXY,
     CNV_TEST_SERVICE_ACCOUNT,
     CNV_TESTS_CONTAINER,
-    OS_FLAVOR_CIRROS,
     SECURITY_CONTEXT,
     TIMEOUT_1MIN,
     TIMEOUT_5SEC,
@@ -499,7 +498,7 @@ def cirros_vm_for_snapshot(
         client=admin_client,
         name=cirros_vm_name,
         namespace=dv_metadata["namespace"],
-        os_flavor=OS_FLAVOR_CIRROS,
+        os_flavor=Images.Cirros.OS_FLAVOR,
         memory_guest=Images.Cirros.DEFAULT_MEMORY_SIZE,
         data_volume_template={
             "metadata": dv_metadata,

tests/storage/restricted_namespace_cloning/conftest.py

@@ -30,7 +30,7 @@
     create_role_binding,
     set_permissions,
 )
-from utilities.constants import OS_FLAVOR_CIRROS, PVC, UNPRIVILEGED_USER, Images
+from utilities.constants import PVC, UNPRIVILEGED_USER, Images
 from utilities.infra import create_ns
 from utilities.storage import create_dv
 from utilities.virt import VirtualMachineForTests, running_vm
@@ -279,7 +279,7 @@ def vm_for_restricted_namespace_cloning_test(
     with VirtualMachineForTests(
         name=VM_FOR_TEST,
         namespace=destination_namespace.name,
-        os_flavor=OS_FLAVOR_CIRROS,
+        os_flavor=Images.Cirros.OS_FLAVOR,
         service_accounts=[restricted_namespace_service_account.name],
         client=unprivileged_client,
         memory_guest=Images.Cirros.DEFAULT_MEMORY_SIZE,