Merge branch 'cnv-4.20' into testGuestLoadMetrics-cnv-4.20

OhadRevah · web-flow · commit ba8623d801bc · 2025-12-30T15:24:07.000+02:00
diff --git a/tests/install_upgrade_operators/crds_cluster_readers_role/test_crds_cluster_readers_role.py b/tests/install_upgrade_operators/crds_cluster_readers_role/test_crds_cluster_readers_role.py
@@ -12,7 +12,14 @@
 
 LOGGER = logging.getLogger(__name__)
 
-pytestmark = [pytest.mark.sno, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x, pytest.mark.conformance]
+pytestmark = [
+    pytest.mark.sno,
+    pytest.mark.gating,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.conformance,
+    pytest.mark.skip_must_gather_collection,
+]
 
 
 @retry(
diff --git a/tests/install_upgrade_operators/csv/test_csv.py b/tests/install_upgrade_operators/csv/test_csv.py
@@ -3,7 +3,13 @@
 import pytest
 from ocp_resources.cluster_service_version import ClusterServiceVersion
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.sno,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 
 # Check CSV properties like keywords, title, provided by, links etc.
 
diff --git a/tests/install_upgrade_operators/csv/test_hco_api_version.py b/tests/install_upgrade_operators/csv/test_hco_api_version.py
@@ -1,7 +1,7 @@
 import pytest
 from ocp_resources.resource import Resource
 
-pytestmark = [pytest.mark.sno, pytest.mark.s390x]
+pytestmark = [pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 @pytest.mark.polarion("CNV-5832")
diff --git a/tests/install_upgrade_operators/csv/test_hco_cr_explainable.py b/tests/install_upgrade_operators/csv/test_hco_cr_explainable.py
@@ -3,7 +3,7 @@
 import pytest
 from pyhelper_utils.shell import run_command
 
-pytestmark = [pytest.mark.sno, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [pytest.mark.sno, pytest.mark.arm64, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 @pytest.mark.polarion("CNV-5884")
diff --git a/tests/install_upgrade_operators/csv/test_immutable_image_using_sha.py b/tests/install_upgrade_operators/csv/test_immutable_image_using_sha.py
@@ -1,6 +1,6 @@
 import pytest
 
-pytestmark = [pytest.mark.sno, pytest.mark.s390x]
+pytestmark = [pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 @pytest.mark.polarion("CNV-4751")
diff --git a/tests/install_upgrade_operators/csv/test_subscription_channels.py b/tests/install_upgrade_operators/csv/test_subscription_channels.py
@@ -1,6 +1,6 @@
 import pytest
 
-pytestmark = [pytest.mark.sno, pytest.mark.s390x]
+pytestmark = [pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 @pytest.mark.polarion("CNV-7169")
diff --git a/tests/install_upgrade_operators/daemonset/test_daemonset_params.py b/tests/install_upgrade_operators/daemonset/test_daemonset_params.py
@@ -3,7 +3,13 @@
 from utilities.constants import ALL_CNV_DAEMONSETS, ALL_CNV_DAEMONSETS_NO_HPP_CSI
 from utilities.infra import get_daemonsets
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.sno,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/install_upgrade_operators/deployment/test_hco_deployment_params.py b/tests/install_upgrade_operators/deployment/test_hco_deployment_params.py
@@ -76,6 +76,7 @@ def test_cnv_deployment_priority_class_name(
         )
 
 
+@pytest.mark.skip_must_gather_collection
 @pytest.mark.gating
 @pytest.mark.conformance
 @pytest.mark.polarion("CNV-8289")
diff --git a/tests/install_upgrade_operators/feature_gates/test_default_featuregates.py b/tests/install_upgrade_operators/feature_gates/test_default_featuregates.py
@@ -24,7 +24,7 @@
 )
 from utilities.constants import CDI_KUBEVIRT_HYPERCONVERGED, KUBEVIRT_HCO_NAME
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.s390x]
+pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/tests/install_upgrade_operators/feature_gates/test_featuregate_reconcile.py b/tests/install_upgrade_operators/feature_gates/test_featuregate_reconcile.py
@@ -19,7 +19,7 @@
     KUBEVIRT_KUBEVIRT_HYPERCONVERGED,
 )
 
-pytestmark = [pytest.mark.sno, pytest.mark.s390x]
+pytestmark = [pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 class TestHardcodedFeatureGates:
diff --git a/tests/install_upgrade_operators/feature_gates/test_update_featuregate_hco.py b/tests/install_upgrade_operators/feature_gates/test_update_featuregate_hco.py
@@ -12,7 +12,7 @@
 
 FEATUREGATE_NAME_KEY_STR = "featuregate_name"
 
-pytestmark = pytest.mark.s390x
+pytestmark = [pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 @pytest.fixture()
diff --git a/tests/install_upgrade_operators/pod_validation/test_pod_spec.py b/tests/install_upgrade_operators/pod_validation/test_pod_spec.py
@@ -39,6 +39,7 @@ def cnv_pods_by_type_no_hpp_csi_hpp_pool(cnv_pod_priority_class_matrix__function
     return pod_list
 
 
+@pytest.mark.skip_must_gather_collection
 @pytest.mark.polarion("CNV-7261")
 def test_no_new_cnv_pods_added(cnv_pods, cnv_jobs):
     all_pods = ALL_CNV_PODS.copy()
diff --git a/tests/install_upgrade_operators/relationship_labels/test_relationship_labels.py b/tests/install_upgrade_operators/relationship_labels/test_relationship_labels.py
@@ -14,7 +14,14 @@
 )
 from utilities.constants import VERSION_LABEL_KEY
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.sno,
+    pytest.mark.gating,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/tests/install_upgrade_operators/resource_params/test_hco_status_conditions.py b/tests/install_upgrade_operators/resource_params/test_hco_status_conditions.py
@@ -9,7 +9,14 @@
 from utilities.hco import wait_for_hco_conditions
 from utilities.infra import get_hyperconverged_resource
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.sno,
+    pytest.mark.gating,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/tests/install_upgrade_operators/security/scc/test_cnv_deployment_required_scc.py b/tests/install_upgrade_operators/security/scc/test_cnv_deployment_required_scc.py
@@ -11,7 +11,7 @@
 REQUIRED_SCC_ANNOTATION = "openshift.io/required-scc"
 REQUIRED_SCC_VALUE = "restricted-v2"
 
-pytestmark = pytest.mark.s390x
+pytestmark = [pytest.mark.s390x, pytest.mark.skip_must_gather_collection]
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/install_upgrade_operators/security/scc/test_cnv_pods_scc.py b/tests/install_upgrade_operators/security/scc/test_cnv_pods_scc.py
@@ -16,7 +16,14 @@
     LINUX_BRIDGE,
 )
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.sno,
+    pytest.mark.gating,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 
 
 LOGGER = logging.getLogger(__name__)
diff --git a/tests/install_upgrade_operators/security/scc/test_default_scc.py b/tests/install_upgrade_operators/security/scc/test_default_scc.py
@@ -7,7 +7,13 @@
 import pytest
 from ocp_resources.security_context_constraints import SecurityContextConstraints
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.gating, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.gating,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/install_upgrade_operators/strict_reconciliation/test_hco_related_objects.py b/tests/install_upgrade_operators/strict_reconciliation/test_hco_related_objects.py
@@ -6,7 +6,13 @@
 )
 from utilities.constants import ALL_HCO_RELATED_OBJECTS
 
-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.arm64, pytest.mark.s390x]
+pytestmark = [
+    pytest.mark.post_upgrade,
+    pytest.mark.sno,
+    pytest.mark.arm64,
+    pytest.mark.s390x,
+    pytest.mark.skip_must_gather_collection,
+]
 
 
 class TestRelatedObjects:
diff --git a/tests/storage/cdi_import/conftest.py b/tests/storage/cdi_import/conftest.py
@@ -113,6 +113,7 @@ def dv_from_http_import(
         size=request.param.get("size", DEFAULT_DV_SIZE),
         storage_class=storage_class_name_scope_module,
     ) as dv:
+        dv.pvc.wait()
         yield dv
 
 
diff --git a/tests/storage/cdi_import/test_import_http.py b/tests/storage/cdi_import/test_import_http.py
@@ -166,10 +166,6 @@ def test_empty_url(namespace, storage_class_name_scope_module):
             pass
 
 
-@pytest.mark.xfail(
-    reason=f"{QUARANTINED}: regression, timeout failure; CNV-70094",
-    run=False,
-)
 @pytest.mark.sno
 @pytest.mark.gating
 @pytest.mark.parametrize(

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,7 @@ def test_cnv_deployment_priority_class_name(`
`76`	`76`	`)`
`77`	`77`
`78`	`78`
	`79`	`+@pytest.mark.skip_must_gather_collection`
`79`	`80`	`@pytest.mark.gating`
`80`	`81`	`@pytest.mark.conformance`
`81`	`82`	`@pytest.mark.polarion("CNV-8289")`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`)`
`25`	`25`	`from utilities.constants import CDI_KUBEVIRT_HYPERCONVERGED, KUBEVIRT_HCO_NAME`
`26`	`26`
`27`		`-pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.s390x]`
	`27`	`+pytestmark = [pytest.mark.post_upgrade, pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]`
`28`	`28`
`29`	`29`	`LOGGER = logging.getLogger(__name__)`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`KUBEVIRT_KUBEVIRT_HYPERCONVERGED,`
`20`	`20`	`)`
`21`	`21`
`22`		`-pytestmark = [pytest.mark.sno, pytest.mark.s390x]`
	`22`	`+pytestmark = [pytest.mark.sno, pytest.mark.s390x, pytest.mark.skip_must_gather_collection]`
`23`	`23`
`24`	`24`
`25`	`25`	`class TestHardcodedFeatureGates:`