Merge branch 'main' into kubevirt_vm_labels

Author: OhadRevah

tests/conftest.py

@@ -2476,9 +2476,11 @@ def migrated_vm_multiple_times(request, vm_for_migration_test):
 
 
 @pytest.fixture()
-def removed_default_storage_classes(cluster_storage_classes):
+def removed_default_storage_classes(admin_client, golden_images_namespace, cluster_storage_classes):
     with remove_default_storage_classes(cluster_storage_classes=cluster_storage_classes):
         yield
+    if not verify_boot_sources_reimported(admin_client=admin_client, namespace=golden_images_namespace.name):
+        pytest.fail("Failed to reimport all boot sources at teardown")
 
 
 @pytest.fixture(scope="session")

tests/infrastructure/golden_images/update_boot_source/test_ssp_data_import_crons.py

@@ -19,7 +19,6 @@
 from tests.infrastructure.golden_images.update_boot_source.utils import get_all_dic_volume_names
 from utilities.constants import (
     BIND_IMMEDIATE_ANNOTATION,
-    QUARANTINED,
     TIMEOUT_1MIN,
     TIMEOUT_2MIN,
     TIMEOUT_5MIN,
@@ -328,10 +327,6 @@ def test_data_import_cron_using_default_storage_class(
         )
 
 
-@pytest.mark.xfail(
-    reason=f"{QUARANTINED}: This test still fail in some cases ; tracked in CNV-62615",
-    run=False,
-)
 @pytest.mark.polarion("CNV-7532")
 def test_data_import_cron_deletion_on_opt_out(
     admin_client,

tests/storage/cdi_import/test_import_http.py

@@ -22,7 +22,6 @@
 from tests.storage.utils import (
     assert_num_files_in_pod,
     assert_use_populator,
-    create_vm_and_verify_image_permission,
     create_vm_from_dv,
     get_file_url,
     get_importer_pod,
@@ -43,11 +42,8 @@
 from utilities.ssp import validate_os_info_vmi_vs_windows_os
 from utilities.storage import (
     ErrorMsg,
-    PodWithPVC,
-    check_disk_count_in_vm,
     create_dummy_first_consumer_pod,
     create_dv,
-    get_containers_for_pods_with_pvc,
     get_test_artifact_server_url,
     sc_volume_binding_mode_is_wffc,
 )
@@ -64,12 +60,6 @@
 DEFAULT_DV_SIZE = Images.Cirros.DEFAULT_DV_SIZE
 SMALL_DV_SIZE = "200Mi"
 
-DV_PARAMS = {
-    "file_name": Images.Cdi.QCOW2_IMG,
-    "source": HTTPS,
-    "configmap_name": INTERNAL_HTTP_CONFIGMAP_NAME,
-}
-
 LATEST_WINDOWS_OS_DICT = py_config.get("latest_windows_os_dict", {})
 
 
@@ -176,45 +166,11 @@ def test_empty_url(namespace, storage_class_name_scope_module):
             pass
 
 
-@pytest.mark.parametrize(
-    "dv_from_http_import",
-    [
-        pytest.param(
-            {
-                "dv_name": "cnv-2145",
-                "file_name": TAR_IMG,
-                "content_type": DataVolume.ContentType.ARCHIVE,
-            },
-        ),
-    ],
-    indirect=True,
-)
-@pytest.mark.sno
-@pytest.mark.polarion("CNV-2145")
-@pytest.mark.s390x
-def test_successful_import_archive(
-    skip_block_volumemode_scope_module,
-    running_pod_with_dv_pvc,
-):
-    """
-    Skip block volume mode - archive does not support block mode DVs,
-    https://github.com/kubevirt/containerized-data-importer/blob/main/doc/supported_operations.md
-    """
-    assert_num_files_in_pod(pod=running_pod_with_dv_pvc, expected_num_of_files=3)
-
-
 @pytest.mark.sno
 @pytest.mark.gating
 @pytest.mark.parametrize(
     "dv_from_http_import",
     [
-        pytest.param(
-            {
-                "dv_name": "cnv-2143",
-                "file_name": Images.Cdi.QCOW2_IMG,
-            },
-            marks=pytest.mark.polarion("CNV-2143"),
-        ),
         pytest.param(
             {
                 "dv_name": "cnv-377",
@@ -226,7 +182,6 @@ def test_successful_import_archive(
     indirect=True,
 )
 def test_successful_import_image(
-    running_pod_with_dv_pvc,
     dv_from_http_import,
     storage_class_name_scope_module,
     cluster_csi_drivers_names,
@@ -270,7 +225,12 @@ def test_successful_import_secure_archive(
     "dv_from_http_import",
     [
         pytest.param(
-            DV_PARAMS,
+            {
+                "dv_name": "cnv-2719",
+                "file_name": Images.Cdi.QCOW2_IMG,
+                "source": HTTPS,
+                "configmap_name": INTERNAL_HTTP_CONFIGMAP_NAME,
+            },
             marks=pytest.mark.polarion("CNV-2719"),
         ),
     ],
@@ -284,20 +244,14 @@ def test_successful_import_secure_image(internal_http_configmap, dv_from_http_im
 
 @pytest.mark.sno
 @pytest.mark.parametrize(
-    ("content_type", "file_name"),
+    "content_type, file_name",
     [
-        pytest.param(
-            DataVolume.ContentType.ARCHIVE,
-            TAR_IMG,
-            marks=(pytest.mark.polarion("CNV-2339")),
-        ),
         pytest.param(
             DataVolume.ContentType.KUBEVIRT,
             Images.Cirros.RAW_IMG_XZ,
             marks=(pytest.mark.polarion("CNV-784"), pytest.mark.smoke()),
         ),
     ],
-    ids=["import_basic_auth_archive", "import_basic_auth_kubevirt"],
 )
 @pytest.mark.s390x
 def test_successful_import_basic_auth(
@@ -324,17 +278,6 @@ def test_successful_import_basic_auth(
         storage_class=storage_class_name_scope_module,
     ) as dv:
         dv.wait_for_dv_success()
-        pvc = dv.pvc
-        with PodWithPVC(
-            namespace=pvc.namespace,
-            name=f"{pvc.name}-pod",
-            pvc_name=pvc.name,
-            containers=get_containers_for_pods_with_pvc(
-                volume_mode=storage_class_matrix__module__[storage_class_name_scope_module]["volume_mode"],
-                pvc_name=pvc.name,
-            ),
-        ) as pod:
-            pod.wait_for_status(status=pod.Status.RUNNING)
 
 
 @pytest.mark.sno
@@ -406,21 +349,6 @@ def test_unpack_compressed(
     )
 
 
-@pytest.mark.parametrize(
-    "dv_from_http_import",
-    [
-        pytest.param(
-            DV_PARAMS,
-            marks=pytest.mark.polarion("CNV-2811"),
-        ),
-    ],
-    indirect=True,
-)
-@pytest.mark.sno
-def test_certconfigmap(internal_http_configmap, running_pod_with_dv_pvc):
-    assert_num_files_in_pod(pod=running_pod_with_dv_pvc, expected_num_of_files=1)
-
-
 @pytest.mark.sno
 @pytest.mark.parametrize(
     ("https_config_map", "dv_from_http_import"),
@@ -517,7 +445,6 @@ def test_successful_concurrent_blank_disk_import(
 ):
     for vm in vm_list_created_by_multiprocess:
         running_vm(vm=vm)
-        check_disk_count_in_vm(vm=vm)
 
 
 @pytest.mark.parametrize(
@@ -644,13 +571,6 @@ def test_successful_vm_from_imported_dv_windows(
     )
 
 
-@pytest.mark.polarion("CNV-4032")
-@pytest.mark.sno
-@pytest.mark.s390x
-def test_disk_image_after_import(skip_block_volumemode_scope_module, cirros_dv_unprivileged):
-    create_vm_and_verify_image_permission(dv=cirros_dv_unprivileged)
-
-
 @pytest.mark.polarion("CNV-4724")
 @pytest.mark.sno
 @pytest.mark.s390x

tests/storage/conftest.py

@@ -62,9 +62,7 @@
 from utilities.jira import is_jira_open
 from utilities.storage import (
     create_cirros_dv_for_snapshot_dict,
-    data_volume,
     get_downloaded_artifact,
-    sc_volume_binding_mode_is_wffc,
     write_file,
 )
 from utilities.virt import VirtualMachineForTests
@@ -211,12 +209,6 @@ def skip_test_if_no_hpp_sc(cluster_storage_classes):
         pytest.skip(f"This test runs only on one of the hpp storage classes: {HPP_STORAGE_CLASSES}")
 
 
-@pytest.fixture(scope="module")
-def skip_when_hpp_no_waitforfirstconsumer(storage_class_matrix_hpp_matrix__module__):
-    if not sc_volume_binding_mode_is_wffc(sc=[*storage_class_matrix_hpp_matrix__module__][0]):
-        pytest.skip("Test only run when volumeBindingMode is WaitForFirstConsumer")
-
-
 @pytest.fixture()
 def uploadproxy_route_deleted(hco_namespace):
     """
@@ -426,21 +418,6 @@ def cirros_vm_name(request):
     return request.param["vm_name"]
 
 
-@pytest.fixture(scope="module")
-def data_volume_multi_hpp_storage(
-    request,
-    namespace,
-    schedulable_nodes,
-    storage_class_matrix_hpp_matrix__module__,
-):
-    yield from data_volume(
-        request=request,
-        namespace=namespace,
-        storage_class=[*storage_class_matrix_hpp_matrix__module__][0],
-        schedulable_nodes=schedulable_nodes,
-    )
-
-
 @pytest.fixture(scope="session")
 def available_hpp_storage_class(skip_test_if_no_hpp_sc, cluster_storage_classes):
     """