fix: use the correct value for the namespace (#342)

Author: fege

conftest.py

@@ -33,6 +33,10 @@
     get_base_dir,
 )
 
+from kubernetes.dynamic import DynamicClient
+from utilities.infra import get_operator_distribution, get_dsci_applications_namespace, get_data_science_cluster
+from ocp_resources.resource import get_client
+
 LOGGER = logging.getLogger(name=__name__)
 BASIC_LOGGER = logging.getLogger(name="basic")
 
@@ -233,6 +237,36 @@ def pytest_sessionstart(session: Session) -> None:
         path=must_gather_dict["must_gather_base_directory"],
         ignore_errors=True,
     )
+    config = session.config
+    if config.getoption("--collect-only") or config.getoption("--setup-plan"):
+        LOGGER.info("Skipping global config update for collect-only or setup-plan")
+        return
+    updated_global_config(admin_client=get_client())
+
+
+def updated_global_config(admin_client: DynamicClient) -> None:
+    """
+    Updates the global config with the distribution, applications namespace, and model registry namespace.
+    Args:
+        admin_client: The admin client to use to get resources.
+    Returns:
+        None
+    """
+    distribution = get_operator_distribution(client=admin_client)
+    if distribution == "Open Data Hub":
+        py_config["distribution"] = "upstream"
+
+    elif distribution.startswith("OpenShift AI"):
+        py_config["distribution"] = "downstream"
+    else:
+        import pytest
+
+        pytest.exit(f"Unknown distribution: {distribution}")
+
+    py_config["applications_namespace"] = get_dsci_applications_namespace(client=admin_client)
+    py_config["model_registry_namespace"] = get_data_science_cluster(
+        client=admin_client
+    ).instance.spec.components.modelregistry.registriesNamespace
 
 
 def pytest_fixture_setup(fixturedef: FixtureDef[Any], request: FixtureRequest) -> None:
@@ -276,9 +310,6 @@ def pytest_runtest_setup(item: Item) -> None:
     elif KServeDeploymentType.MODEL_MESH.lower() in item.keywords:
         item.fixturenames.insert(0, "enabled_modelmesh_in_dsc")
 
-    # The above fixtures require the global config to be updated before being called
-    item.fixturenames.insert(0, "updated_global_config")
-
 
 def pytest_runtest_call(item: Item) -> None:
     BASIC_LOGGER.info(f"{separator(symbol_='-', val='CALL')}")

tests/conftest.py

@@ -30,11 +30,8 @@
 from utilities.infra import (
     verify_cluster_sanity,
     create_ns,
-    get_dsci_applications_namespace,
-    get_operator_distribution,
     login_with_user_password,
     get_openshift_token,
-    get_data_science_cluster,
 )
 from utilities.constants import (
     AcceleratorType,
@@ -65,23 +62,6 @@ def tests_tmp_dir(request: FixtureRequest, tmp_path_factory: TempPathFactory) ->
     shutil.rmtree(path=str(tests_tmp_path), ignore_errors=True)
 
 
-@pytest.fixture(scope="session")
-def updated_global_config(request: FixtureRequest, admin_client: DynamicClient) -> None:
-    distribution = get_operator_distribution(client=admin_client)
-    if distribution == "Open Data Hub":
-        py_config["distribution"] = "upstream"
-
-    elif distribution.startswith("OpenShift AI"):
-        py_config["distribution"] = "downstream"
-    else:
-        pytest.exit(f"Unknown distribution: {distribution}")
-
-    py_config["applications_namespace"] = get_dsci_applications_namespace(client=admin_client)
-    py_config["model_registry_namespace"] = get_data_science_cluster(
-        client=admin_client
-    ).instance.spec.components.modelregistry.registriesNamespace
-
-
 @pytest.fixture(scope="session")
 def current_client_token(admin_client: DynamicClient) -> str:
     return get_openshift_token()