Merge branch 'main' into testCustomCliDownload

Author: OhadRevah

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
         stages: [pre-commit]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.13.1
+    rev: v0.13.2
     hooks:
       - id: ruff
         stages: [pre-commit]

OWNERS

@@ -8,3 +8,5 @@ reviewers:
   - vsibirsk
   - dshchedr
   - rnetser
+emeritus_approvers:
+  - dbasunag  # 2025-03-10

docs/OWNERS.md

@@ -0,0 +1,10 @@
+Taken from [Kubernetes OWNERS guide](https://www.kubernetes.dev/docs/guide/owners/#owners)
+
+# OWNERS files
+Each directory that contains a unit of independent code or content may also contain an OWNERS file. This file applies to everything within the directory, including the OWNERS file itself, sibling files, and child directories.
+
+OWNERS files are in YAML format and support the following keys:
+
+- approvers: a list of GitHub usernames or aliases that can /approve a PR.
+- reviewers: a list of GitHub usernames or aliases that are good candidates to /lgtm a PR.
+- emeritus_approvers a list of GitHub usernames of folks who were previously in the approvers section, but are no longer actively approving code.

tests/conftest.py

@@ -31,6 +31,7 @@
 from ocp_resources.cluster_service_version import ClusterServiceVersion
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.daemonset import DaemonSet
+from ocp_resources.data_source import DataSource
 from ocp_resources.datavolume import DataVolume
 from ocp_resources.deployment import Deployment
 from ocp_resources.hostpath_provisioner import HostPathProvisioner
@@ -105,6 +106,7 @@
     POD_SECURITY_NAMESPACE_LABELS,
     PREFERENCE_STR,
     RHEL9_PREFERENCE,
+    RHEL9_STR,
     RHEL_WITH_INSTANCETYPE_AND_PREFERENCE,
     RHSM_SECRET_NAME,
     SSP_CR_COMMON_TEMPLATES_LIST_KEY_NAME,
@@ -899,6 +901,16 @@ def golden_image_data_source_scope_function(admin_client, golden_image_data_volu
     yield from create_or_update_data_source(admin_client=admin_client, dv=golden_image_data_volume_scope_function)
 
 
+@pytest.fixture(scope="module")
+def rhel9_data_source_scope_module(golden_images_namespace):
+    return DataSource(
+        client=golden_images_namespace.client,
+        name=RHEL9_STR,
+        namespace=golden_images_namespace.name,
+        ensure_exists=True,
+    )
+
+
 """
 VM creation from template
 """

tests/infrastructure/golden_images/update_boot_source/test_ssp_common_templates_boot_sources.py

@@ -11,7 +11,7 @@
     assert_missing_golden_image_pvc,
     assert_os_version_mismatch_in_vm,
 )
-from utilities.constants import TIMEOUT_5MIN, TIMEOUT_5SEC, Images
+from utilities.constants import RHEL9_STR, TIMEOUT_5MIN, TIMEOUT_5SEC, Images
 from utilities.infra import (
     cleanup_artifactory_secret_and_config_map,
     get_artifactory_config_map,
@@ -21,7 +21,6 @@
 from utilities.virt import VirtualMachineForTestsFromTemplate, running_vm
 
 LOGGER = logging.getLogger(__name__)
-RHEL9_NAME = "rhel9"
 
 
 @pytest.fixture()
@@ -37,14 +36,6 @@ def matrix_data_source(auto_update_data_source_matrix__function__, golden_images
     )
 
 
-@pytest.fixture()
-def rhel9_data_source(golden_images_namespace):
-    return DataSource(
-        name=RHEL9_NAME,
-        namespace=golden_images_namespace.name,
-    )
-
-
 @pytest.fixture()
 def existing_data_source_volume(
     admin_client,
@@ -85,13 +76,13 @@ def auto_update_boot_source_vm(
 
 
 @pytest.fixture()
-def vm_without_boot_source(unprivileged_client, namespace, rhel9_data_source):
+def vm_without_boot_source(unprivileged_client, namespace, rhel9_data_source_scope_module):
     with VirtualMachineForTestsFromTemplate(
-        name=f"{rhel9_data_source.name}-vm",
+        name=f"{rhel9_data_source_scope_module.name}-vm",
         namespace=namespace.name,
         client=unprivileged_client,
         labels=template_labels(os="rhel9.0"),
-        data_source=rhel9_data_source,
+        data_source=rhel9_data_source_scope_module,
         non_existing_pvc=True,
     ) as vm:
         vm.start()
@@ -100,28 +91,28 @@ def vm_without_boot_source(unprivileged_client, namespace, rhel9_data_source):
 
 
 @pytest.fixture()
-def opted_out_rhel9_data_source(rhel9_data_source):
-    LOGGER.info(f"Wait for DataSource {rhel9_data_source.name} to opt out")
+def opted_out_rhel9_data_source(rhel9_data_source_scope_module):
+    LOGGER.info(f"Wait for DataSource {rhel9_data_source_scope_module.name} to opt out")
     try:
         for sample in TimeoutSampler(
             wait_timeout=TIMEOUT_5MIN,
             sleep=TIMEOUT_5SEC,
-            func=lambda: rhel9_data_source.source.name == RHEL9_NAME,
+            func=lambda: rhel9_data_source_scope_module.source.name == RHEL9_STR,
         ):
             if sample:
                 return
     except TimeoutExpiredError:
-        LOGGER.error(f"{rhel9_data_source.name} DataSource source was not updated.")
+        LOGGER.error(f"{rhel9_data_source_scope_module.name} DataSource source was not updated.")
         raise
 
 
 @pytest.fixture()
-def rhel9_dv(admin_client, golden_images_namespace, rhel9_data_source, rhel9_http_image_url):
+def rhel9_dv(admin_client, golden_images_namespace, rhel9_data_source_scope_module, rhel9_http_image_url):
     artifactory_secret = get_artifactory_secret(namespace=golden_images_namespace.name)
     artifactory_config_map = get_artifactory_config_map(namespace=golden_images_namespace.name)
     with DataVolume(
         client=admin_client,
-        name=rhel9_data_source.source.name,
+        name=rhel9_data_source_scope_module.source.name,
         namespace=golden_images_namespace.name,
         url=rhel9_http_image_url,
         secret=artifactory_secret,

tests/install_upgrade_operators/product_install/constants.py

@@ -36,6 +36,7 @@
         "kubevirt-hyperconverged-",
         "olm.og.openshift-cnv-",
         "kubevirt-ipam-controller-manager-role",
+        "kubevirt-synchronization-controller",
     ],
     "ClusterRoleBinding": [
         "hostpath-provisioner-operator-service-system:auth-delegator",
@@ -57,6 +58,8 @@
         "template-validator",
         "kubevirt-hyperconverged-",
         "olm.og.openshift-cnv-kubevirt-ipam-controller-manager-rolebinding",
+        "kubevirt-synchronization-controller",
+        "kubevirt-ipam-controller-manager-rolebinding",
     ],
     "Namespace": ["openshift-cnv", "openshift-virtualization-os-images"],
     "Project": ["openshift-cnv", "openshift-virtualization-os-images"],

tests/storage/golden_image/test_cached_snapshots.py

@@ -5,14 +5,13 @@
 from benedict import benedict
 from kubernetes.dynamic.exceptions import ResourceNotFoundError
 from ocp_resources.data_import_cron import DataImportCron
-from ocp_resources.data_source import DataSource
 from ocp_resources.datavolume import DataVolume
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.storage_profile import StorageProfile
 from ocp_resources.volume_snapshot import VolumeSnapshot
 
 from tests.os_params import RHEL_LATEST_LABELS
-from utilities.constants import DATA_IMPORT_CRON_ENABLE, TIMEOUT_3MIN
+from utilities.constants import DATA_IMPORT_CRON_ENABLE, RHEL9_STR, TIMEOUT_3MIN
 from utilities.hco import (
     disable_common_boot_image_import_hco_spec,
     update_hco_templates_spec,
@@ -32,7 +31,6 @@
 pytestmark = pytest.mark.usefixtures(
     "skip_if_no_storage_profile_with_snapshot_import_cron_format",
 )
-RHEL9_STR = "rhel9"
 
 
 def get_rhel9_data_import_cron_template(common_templates):
@@ -121,17 +119,6 @@ def updated_rhel9_boot_source(
         ).clean_up()
 
 
-@pytest.fixture(scope="module")
-def rhel9_data_source_scope_module(golden_images_namespace):
-    data_source = DataSource(
-        name=RHEL9_STR,
-        namespace=golden_images_namespace.name,
-    )
-    if data_source.exists:
-        return data_source
-    raise ResourceNotFoundError(f"{RHEL9_STR} DataImportCron should exist in the cluster")
-
-
 @pytest.fixture(scope="module")
 def rhel9_boot_source_name(rhel9_data_source_scope_module):
     return rhel9_data_source_scope_module.source.name

utilities/constants.py

@@ -394,6 +394,7 @@ class S390X:
 CREATING_VIRTUAL_MACHINE_FROM_VOLUME = "creating-virtual-machine-from-volume"
 UPLOAD_BOOT_SOURCE = "upload-boot-source"
 GRAFANA_DASHBOARD_KUBEVIRT_TOP_CONSUMERS = "grafana-dashboard-kubevirt-top-consumers"
+RHEL9_STR = "rhel9"
 RHEL8_GUEST = "rhel8-guest"
 RHEL9_GUEST = "rhel9-guest"
 RHEL10_GUEST = "rhel10-guest"