merge to main

Author: jpeimer

tests/infrastructure/golden_images/update_boot_source/test_ssp_data_import_crons.py

@@ -16,10 +16,14 @@
     CUSTOM_DATA_SOURCE_NAME,
     DEFAULT_FEDORA_REGISTRY_URL,
 )
-from tests.infrastructure.golden_images.update_boot_source.utils import (
-    template_labels,
+from utilities.constants import (
+    BIND_IMMEDIATE_ANNOTATION,
+    TIMEOUT_1MIN,
+    TIMEOUT_2MIN,
+    TIMEOUT_5MIN,
+    TIMEOUT_10MIN,
+    Images,
 )
-from utilities.constants import BIND_IMMEDIATE_ANNOTATION, TIMEOUT_1MIN, TIMEOUT_2MIN, TIMEOUT_5MIN, TIMEOUT_10MIN
 from utilities.hco import ResourceEditorValidateHCOReconcile
 from utilities.infra import create_ns
 from utilities.ssp import (
@@ -32,7 +36,7 @@
     DATA_IMPORT_CRON_SUFFIX,
     data_volume_template_with_source_ref_dict,
 )
-from utilities.virt import DV_DISK, VirtualMachineForTests, VirtualMachineForTestsFromTemplate, running_vm
+from utilities.virt import DV_DISK, VirtualMachineForTests, running_vm
 
 LOGGER = logging.getLogger(__name__)
 
@@ -157,12 +161,12 @@ def reconciled_custom_data_source(custom_data_source_scope_function):
 
 @pytest.fixture()
 def vm_from_custom_data_import_cron(custom_data_source_scope_function, namespace, local_unprivileged_client):
-    with VirtualMachineForTestsFromTemplate(
+    with VirtualMachineForTests(
         name=f"{custom_data_source_scope_function.name}-vm",
         namespace=namespace.name,
         client=local_unprivileged_client,
-        labels=template_labels(os="fedora40"),
-        data_source=custom_data_source_scope_function,
+        memory_guest=Images.Fedora.DEFAULT_MEMORY_SIZE,
+        data_volume_template=data_volume_template_with_source_ref_dict(data_source=custom_data_source_scope_function),
     ) as vm:
         running_vm(vm=vm)
         yield vm

tests/install_upgrade_operators/security/scc/test_cnv_deployment_required_scc.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+"""
+Test to verify all HCO deployments have 'openshift.io/required-scc' annotation.
+"""
+
+import pytest
+from ocp_resources.deployment import Deployment
+
+from utilities.constants import ALL_CNV_DEPLOYMENTS_NO_HPP_POOL
+
+REQUIRED_SCC_ANNOTATION = "openshift.io/required-scc"
+REQUIRED_SCC_VALUE = "restricted-v2"
+
+
+@pytest.fixture(scope="module")
+def required_scc_deployment_check(admin_client, hco_namespace):
+    missing_required_scc_annotation = []
+    incorrect_required_scc_annotation_value = {}
+
+    for dp in (
+        Deployment(client=admin_client, name=name, namespace=hco_namespace.name)
+        for name in ALL_CNV_DEPLOYMENTS_NO_HPP_POOL
+    ):
+        scc = dp.instance.spec.template.metadata.annotations.get(REQUIRED_SCC_ANNOTATION)
+
+        if scc is None:
+            missing_required_scc_annotation.append(dp.name)
+        elif scc != REQUIRED_SCC_VALUE:
+            incorrect_required_scc_annotation_value[dp.name] = scc
+
+    return {
+        "missing_required_scc_annotation": missing_required_scc_annotation,
+        "incorrect_required_scc_annotation_value": incorrect_required_scc_annotation_value,
+    }
+
+
+@pytest.mark.polarion("CNV-11964")
+def test_deployments_missing_required_scc_annotation(required_scc_deployment_check):
+    assert not required_scc_deployment_check["missing_required_scc_annotation"], (
+        f"Deployments missing {REQUIRED_SCC_ANNOTATION} annotation: "
+        f"{required_scc_deployment_check['missing_required_scc_annotation']}"
+    )
+
+
+@pytest.mark.polarion("CNV-11965")
+def test_deployments_with_incorrect_required_scc(required_scc_deployment_check):
+    assert not required_scc_deployment_check["incorrect_required_scc_annotation_value"], (
+        f"Deployments incorrect {REQUIRED_SCC_ANNOTATION} annotation : "
+        f"{required_scc_deployment_check['incorrect_required_scc_annotation_value']}"
+    )