Merge branch 'main' into fix_ns

Author: dbasunag

Dockerfile

@@ -6,7 +6,7 @@ ARG TESTS_DIR=$HOME/opendatahub-tests/
 ENV UV_PYTHON=python3.12
 ENV UV_COMPILE_BYTECODE=1
 ENV UV_NO_SYNC=1
-ENV UV_CACHE_DIR=${TESTS_DIR}/.cache
+ENV UV_NO_CACHE=1
 
 ENV BIN_DIR="$HOME_DIR/.local/bin"
 ENV PATH="$PATH:$BIN_DIR"

tests/workbenches/conftest.py

@@ -13,9 +13,10 @@
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.route import Route
 from ocp_resources.notebook import Notebook
+from ocp_resources.cluster_operator import ClusterOperator
 
 
-from utilities.constants import Labels
+from utilities.constants import Labels, Timeout
 from utilities import constants
 from utilities.constants import INTERNAL_IMAGE_REGISTRY_PATH
 
@@ -36,17 +37,38 @@ def users_persistent_volume_claim(
         yield pvc
 
 
+@pytest.fixture(scope="function")
+def internal_image_registry(
+    admin_client: DynamicClient,
+) -> Generator[ClusterOperator | None, None, None]:
+    try:
+        image_registry = ClusterOperator(
+            client=admin_client,
+            name="image-registry",
+            ensure_exists=True,
+        )
+        image_registry.wait_for_condition(
+            condition=ClusterOperator.Condition.AVAILABLE,
+            status=ClusterOperator.Condition.Status.TRUE,
+            timeout=Timeout.TIMEOUT_30SEC,
+        )
+        yield image_registry
+    except ResourceNotFoundError:
+        yield None
+
+
 @pytest.fixture(scope="function")
 def minimal_image() -> Generator[str, None, None]:
     """Provides a full image name of a minimal workbench image"""
     image_name = "jupyter-minimal-notebook" if py_config.get("distribution") == "upstream" else "s2i-minimal-notebook"
-    yield f"{INTERNAL_IMAGE_REGISTRY_PATH}/{py_config['applications_namespace']}/{image_name}:{'2024.2'}"
+    yield f"{image_name}:{'2024.2'}"
 
 
 @pytest.fixture(scope="function")
 def default_notebook(
     request: pytest.FixtureRequest,
     admin_client: DynamicClient,
+    internal_image_registry: ClusterOperator | None,
     minimal_image: str,
 ) -> Generator[Notebook, None, None]:
     """Returns a new Notebook CR for a given namespace, name, and image"""
@@ -62,6 +84,13 @@ def default_notebook(
     # Set the correct username
     username = get_username(dyn_client=admin_client)
 
+    # Set the image path based on internal image registry status
+    minimal_image_path = (
+        f"{INTERNAL_IMAGE_REGISTRY_PATH}/{py_config['applications_namespace']}/{minimal_image}"
+        if internal_image_registry
+        else ":" + minimal_image.rsplit(":", maxsplit=1)[1]
+    )
+
     probe_config = {
         "failureThreshold": 3,
         "httpGet": {
@@ -83,6 +112,7 @@ def default_notebook(
                 "notebooks.opendatahub.io/inject-oauth": "true",
                 "opendatahub.io/accelerator-name": "",
                 "opendatahub.io/service-mesh": "false",
+                "notebooks.opendatahub.io/last-image-selection": minimal_image,
             },
             "labels": {
                 Labels.Openshift.APP: name,
@@ -114,9 +144,9 @@ def default_notebook(
                                     "                  "
                                     f'--ServerApp.tornado_settings={{"user":"{username}","hub_host":"https://{route.host}","hub_prefix":"/projects/{namespace}"}}',  # noqa: E501 line too long
                                 },
-                                {"name": "JUPYTER_IMAGE", "value": minimal_image},
+                                {"name": "JUPYTER_IMAGE", "value": minimal_image_path},
                             ],
-                            "image": minimal_image,
+                            "image": minimal_image_path,
                             "imagePullPolicy": "Always",
                             "livenessProbe": probe_config,
                             "name": name,

tests/workbenches/notebook-controller/test_spawning.py

@@ -1,11 +1,15 @@
 import pytest
 
-from timeout_sampler import TimeoutExpiredError
+from kubernetes.dynamic.client import DynamicClient
 
 from ocp_resources.pod import Pod
+from ocp_resources.namespace import Namespace
+from ocp_resources.notebook import Notebook
+from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 
 
 class TestNotebook:
+    @pytest.mark.smoke
     @pytest.mark.parametrize(
         "unprivileged_model_namespace,users_persistent_volume_claim,default_notebook",
         [
@@ -25,25 +29,18 @@ class TestNotebook:
     )
     def test_create_simple_notebook(
         self,
-        unprivileged_client,
-        unprivileged_model_namespace,
-        users_persistent_volume_claim,
-        default_notebook,
+        unprivileged_client: DynamicClient,
+        unprivileged_model_namespace: Namespace,
+        users_persistent_volume_claim: PersistentVolumeClaim,
+        default_notebook: Notebook,
     ):
         """
         Create a simple Notebook CR with all necessary resources and see if the Notebook Operator creates it properly
         """
-        pods = Pod.get(
-            dyn_client=unprivileged_client,
-            namespace=unprivileged_model_namespace.name,
-            label_selector=f"app={unprivileged_model_namespace.name}",
+        notebook_pod = Pod(
+            client=unprivileged_client,
+            namespace=default_notebook.namespace,
+            name=f"{default_notebook.name}-0",
         )
-        assert pods, "The expected notebook pods were not found"
-
-        failed_pods = []
-        for pod in pods:
-            try:
-                pod.wait_for_condition(condition=pod.Condition.READY, status=pod.Condition.Status.TRUE)
-            except TimeoutExpiredError:
-                failed_pods.append(pod)
-        assert not failed_pods, f"The following pods failed to get READY when starting the notebook: {failed_pods}"
+        notebook_pod.wait()
+        notebook_pod.wait_for_condition(condition=Pod.Condition.READY, status=Pod.Condition.Status.TRUE)

utilities/infra.py

@@ -368,10 +368,11 @@ def is_managed_cluster(client: DynamicClient) -> bool:
 
     platform_statuses = infra.instance.status.platformStatus
 
-    for entries in platform_statuses.values():
-        if isinstance(entries, kubernetes.dynamic.resource.ResourceField):
-            if tags := entries.resourceTags:
-                return next(b["value"] == "true" for b in tags if b["key"] == "red-hat-managed")
+    for entry in platform_statuses.values():
+        if isinstance(entry, kubernetes.dynamic.resource.ResourceField):
+            if tags := entry.resourceTags:
+                LOGGER.info(f"Infrastructure {infra.name} resource tags: {tags}")
+                return any([tag["value"] == "true" for tag in tags if tag["key"] == "red-hat-managed"])
 
     return False