Fetch upload job image dynamically from installed rhoai version (#610)

* fix: Fetch upload job image dynamically from installed rhoai version

Signed-off-by: lugi0 <lgiorgi@redhat.com>

* fix: address review comments

Signed-off-by: lugi0 <lgiorgi@redhat.com>

* fix: use pyconfig applications namespace

Signed-off-by: lugi0 <lgiorgi@redhat.com>

---------

Signed-off-by: lugi0 <lgiorgi@redhat.com>

Author: lugi0

tests/model_registry/async_job/conftest.py

@@ -3,19 +3,20 @@
 
 import pytest
 from kubernetes.dynamic import DynamicClient
+from kubernetes.dynamic.exceptions import ResourceNotFoundError
 from ocp_resources.job import Job
 
 from tests.model_registry.async_job.constants import (
     ASYNC_JOB_ANNOTATIONS,
     ASYNC_JOB_LABELS,
-    ASYNC_UPLOAD_IMAGE,
     ASYNC_UPLOAD_JOB_NAME,
     MODEL_SYNC_CONFIG,
     VOLUME_MOUNTS,
 )
 
 import shortuuid
 from pytest import FixtureRequest
+from pytest_testconfig import py_config
 
 from ocp_resources.namespace import Namespace
 from ocp_resources.pod import Pod
@@ -25,6 +26,7 @@
 from ocp_resources.service import Service
 from ocp_resources.service_account import ServiceAccount
 from ocp_resources.model_registry_modelregistry_opendatahub_io import ModelRegistry
+from ocp_resources.config_map import ConfigMap
 from model_registry.types import RegisteredModel
 from model_registry import ModelRegistry as ModelRegistryClient
 
@@ -114,6 +116,39 @@ def oci_secret_for_async_job(
         yield secret
 
 
+@pytest.fixture(scope="class")
+def async_upload_image(admin_client: DynamicClient) -> str:
+    """
+    Get the async upload image dynamically from the model-registry-operator-parameters ConfigMap.
+
+    This fetches the image from the cluster at runtime instead of using a hardcoded value.
+
+    Args:
+        admin_client: Kubernetes client for resource access
+
+    Returns:
+        str: The async upload image URL from the ConfigMap
+
+    Raises:
+        KeyError: If the ConfigMap or the required key doesn't exist
+    """
+    config_map = ConfigMap(
+        client=admin_client,
+        name="model-registry-operator-parameters",
+        namespace=py_config["applications_namespace"],
+    )
+
+    if not config_map.exists:
+        raise ResourceNotFoundError(
+            f"ConfigMap 'model-registry-operator-parameters' not found in namespace '{py_config['applications_namespace']}'"  # noqa: E501
+        )
+
+    try:
+        return config_map.instance.data["IMAGES_JOBS_ASYNC_UPLOAD"]
+    except KeyError as e:
+        raise KeyError(f"Key 'IMAGES_JOBS_ASYNC_UPLOAD' not found in ConfigMap data: {e}") from e
+
+
 @pytest.fixture(scope="class")
 def model_sync_async_job(
     admin_client: DynamicClient,
@@ -125,6 +160,7 @@ def model_sync_async_job(
     oci_secret_for_async_job: Secret,
     oci_registry_host: str,
     mr_access_role_binding: RoleBinding,
+    async_upload_image: str,
     teardown_resources: bool,
 ) -> Generator[Job, Any, Any]:
     """
@@ -146,6 +182,7 @@ def model_sync_async_job(
         oci_secret_for_async_job: Secret containing OCI registry credentials
         oci_registry_host: OCI registry hostname
         mr_access_role_binding: Role binding for Model Registry access
+        async_upload_image: Container image URL for async upload job (fetched dynamically)
         teardown_resources: Whether to clean up resources after test
 
     Returns:
@@ -210,7 +247,7 @@ def model_sync_async_job(
         containers=[
             {
                 "name": "async-upload",
-                "image": ASYNC_UPLOAD_IMAGE,
+                "image": async_upload_image,
                 "volumeMounts": volume_mounts,
                 "env": environment_variables,
             }

tests/model_registry/async_job/constants.py

@@ -1,6 +1,5 @@
 # Job identification
 ASYNC_UPLOAD_JOB_NAME = "model-sync-async-job"
-ASYNC_UPLOAD_IMAGE = "quay.io/opendatahub/model-registry-job-async-upload:v0.3.0"
 
 # Job labels and annotations
 ASYNC_JOB_LABELS = {

tests/model_registry/async_job/test_async_upload_e2e.py

@@ -58,10 +58,10 @@
     ],
     indirect=True,
 )
+@pytest.mark.downstream_only
 class TestAsyncUploadE2E:
     """RHOAIENG-32501: Test for async upload job with real MinIO, OCI registry, Connection Secrets and Model Registry"""
 
-    # FAILS until https://github.com/kubeflow/model-registry/pull/1499 is merged downstream
     @pytest.mark.dependency(name="job_creation_and_pod_spawning")
     def test_job_creation_and_pod_spawning(
         self: Self,