Merge branch 'main' into testGuestLoadMetrics

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.14.3
+    rev: v0.14.4
     hooks:
       - id: ruff
         stages: [pre-commit]
@@ -60,7 +60,7 @@ repos:
         stages: [commit-msg]
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: "v8.28.0"
+    rev: "v8.29.0"
     hooks:
       - id: gitleaks
 

tests/conftest.py

@@ -36,7 +36,6 @@
 from ocp_resources.deployment import Deployment
 from ocp_resources.hostpath_provisioner import HostPathProvisioner
 from ocp_resources.infrastructure import Infrastructure
-from ocp_resources.installplan import InstallPlan
 from ocp_resources.machine import Machine
 from ocp_resources.migration_policy import MigrationPolicy
 from ocp_resources.mutating_webhook_config import MutatingWebhookConfiguration
@@ -1578,21 +1577,6 @@ def hco_spec(hyperconverged_resource_scope_function):
     return hyperconverged_resource_scope_function.instance.to_dict()["spec"]
 
 
-@pytest.fixture(scope="module")
-def is_post_cnv_upgrade_cluster(admin_client, hco_namespace):
-    return (
-        len(
-            list(
-                InstallPlan.get(
-                    dyn_client=admin_client,
-                    namespace=hco_namespace.name,
-                )
-            )
-        )
-        > 1
-    )
-
-
 @pytest.fixture(scope="session")
 def cluster_info(
     admin_client,

tests/install_upgrade_operators/cert_renewal/conftest.py

@@ -21,7 +21,7 @@
 )
 from utilities.constants import TIMEOUT_1MIN, TIMEOUT_11MIN
 from utilities.hco import ResourceEditorValidateHCOReconcile, wait_for_hco_conditions
-from utilities.infra import is_jira_open
+from utilities.jira import is_jira_open
 
 LOGGER = logging.getLogger(__name__)
 

tests/install_upgrade_operators/conftest.py

@@ -27,8 +27,8 @@
     get_daemonset_by_name,
     get_deployment_by_name,
     get_pod_by_name_prefix,
-    is_jira_open,
 )
+from utilities.jira import is_jira_open
 from utilities.operator import (
     disable_default_sources_in_operatorhub,
     get_machine_config_pools_conditions,

tests/install_upgrade_operators/csv/csv_permissions_audit/test_csv_permissions_audit.py

@@ -15,7 +15,7 @@
     CNV_OPERATORS,
     HOSTPATH_PROVISIONER_OPERATOR,
 )
-from utilities.infra import is_jira_open
+from utilities.jira import is_jira_open
 
 LOGGER = logging.getLogger(__name__)
 

tests/install_upgrade_operators/must_gather/test_must_gather_vms.py

@@ -32,7 +32,7 @@
 )
 from tests.os_params import FEDORA_LATEST
 from utilities.constants import ARM_64, COUNT_FIVE, S390X
-from utilities.infra import is_jira_open
+from utilities.jira import is_jira_open
 
 pytestmark = [pytest.mark.post_upgrade, pytest.mark.skip_must_gather_collection, pytest.mark.arm64, pytest.mark.s390x]
 

tests/install_upgrade_operators/relationship_labels/test_all_cnv_resources.py

@@ -9,7 +9,7 @@
     get_resource,
 )
 from utilities.exceptions import ResourceValueError
-from utilities.infra import is_jira_open
+from utilities.jira import is_jira_open
 
 pytestmark = [pytest.mark.arm64, pytest.mark.s390x]
 

tests/install_upgrade_operators/strict_reconciliation/conftest.py

@@ -18,7 +18,7 @@
 from tests.utils import wait_for_cr_labels_change
 from utilities.constants import HCO_BEARER_AUTH, TIMEOUT_1MIN, VERSION_LABEL_KEY
 from utilities.hco import ResourceEditorValidateHCOReconcile
-from utilities.infra import is_jira_open
+from utilities.jira import is_jira_open
 
 LOGGER = logging.getLogger(__name__)
 DISABLED_KUBEVIRT_FEATUREGATES_IN_SNO = ["LiveMigration", "SRIOVLiveMigration"]

tests/network/bgp/conftest.py

@@ -29,6 +29,7 @@
     generate_frr_conf,
     wait_for_bgp_connection_established,
 )
+from tests.network.libs.ip import random_ipv4_address
 from tests.network.libs.label_selector import LabelSelector
 from tests.network.libs.nodenetworkstate import DEFAULT_ROUTE_V4, lookup_br_ex_gateway_v4
 from tests.network.libs.vm_factory import udn_vm
@@ -38,8 +39,8 @@
 BGP_DATA_PATH: Final[Path] = Path(__file__).resolve().parent / "data" / "frr-config"
 CUDN_BGP_LABEL: Final[dict] = {"cudn-bgp": "blue"}
 CUDN_SUBNET_IPV4: Final[str] = "192.168.10.0/24"
-EXTERNAL_PROVIDER_SUBNET_IPV4: Final[str] = "10.250.100.0/24"
-EXTERNAL_PROVIDER_IP_V4: Final[str] = "10.250.100.150/24"
+EXTERNAL_PROVIDER_SUBNET_IPV4: Final[str] = f"{random_ipv4_address(net_seed=1, host_address=0)}/24"
+EXTERNAL_PROVIDER_IP_V4: Final[str] = f"{random_ipv4_address(net_seed=1, host_address=150)}/24"
 IPERF3_SERVER_PORT: Final[int] = 2354