Merge branch 'opendatahub-io:main' into main

Author: dbasunag

.coderabbit.yaml

@@ -32,7 +32,8 @@ reviews:
   auto_review:
     enabled: true
     auto_incremental_review: true
-    ignore_title_keywords: []
+    ignore_title_keywords: ['wip', 'do not merge', 'do not review',
+                            'lock file maintenance', 'pre-commit autoupdate']
     labels: []
     drafts: false
     base_branches: []

.github/workflows/scripts/constants.py

@@ -18,6 +18,8 @@
     f"{LABEL_PREFIX}{LGTM_LABEL_STR}",
     f"{LABEL_PREFIX}{VERIFIED_LABEL_STR}",
     f"{LABEL_PREFIX}{HOLD_LABEL_STR}",
+    f"{LABEL_PREFIX}build-push-pr-image",
+    f"{LABEL_PREFIX}cherry-pick",
 }
 
 CANCEL_ACTION: str = "cancel"
@@ -38,7 +40,7 @@
         `verified` label removed on each new commit push.
  * To Cherry-pick a merged PR `/cherry-pick <target_branch_name>` to the PR. If <target_branch_name> is valid,
          and the current PR is merged, a cherry-picked PR would be created and linked to the current PR.
- * To build and push image to quay, add /build-push-pr-image in a comment. This would create an image with tag
+ * To build and push image to quay, add `/build-push-pr-image` in a comment. This would create an image with tag
  pr-<pr_number> to quay repository. This image tag, however would be deleted on PR merge or close action.
 
 <details>

.pre-commit-config.yaml

@@ -19,7 +19,7 @@ repos:
       - id: check-toml
 
   - repo: https://github.com/PyCQA/flake8
-    rev: "7.2.0"
+    rev: "7.3.0"
     hooks:
       - id: flake8
         args: [--config=.flake8]
@@ -35,7 +35,7 @@ repos:
       - id: detect-secrets
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.13
+    rev: v0.12.0
     hooks:
       - id: ruff
       - id: ruff-format
@@ -54,7 +54,7 @@ repos:
       - id: gitleaks
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.16.0
+    rev: v1.16.1
     hooks:
       - id: mypy
         additional_dependencies: ["types-PyYAML", "types-requests"]

Dockerfile

@@ -17,19 +17,6 @@ RUN apt-get update \
     && apt-get autoremove --yes \
     && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
-# Install the Rosa CLI
-RUN curl -L https://mirror.openshift.com/pub/openshift-v4/clients/rosa/latest/rosa-linux.tar.gz --output /tmp/rosa-linux.tar.gz \
-    && tar xvf /tmp/rosa-linux.tar.gz --no-same-owner \
-    && mv rosa /usr/bin/rosa \
-    && chmod +x /usr/bin/rosa \
-    && rosa version
-
-# Install the OpenShift CLI (OC)
-RUN curl -L https://mirror.openshift.com/pub/openshift-v4/x86_64/clients/ocp/stable/openshift-client-linux.tar.gz --output /tmp/openshift-client-linux.tar.gz \
-    && tar xvf /tmp/openshift-client-linux.tar.gz --no-same-owner \
-    && mv oc /usr/bin/oc \
-    && chmod +x /usr/bin/oc
-
 # Install grpcurl
 RUN curl -sSL "https://github.com/fullstorydev/grpcurl/releases/download/v1.9.2/grpcurl_1.9.2_linux_x86_64.tar.gz"  --output /tmp/grpcurl_1.2.tar.gz \
     && tar xvf /tmp/grpcurl_1.2.tar.gz --no-same-owner \

conftest.py

@@ -32,11 +32,11 @@
     collect_rhoai_must_gather,
     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")
 
@@ -106,6 +106,11 @@ def pytest_addoption(parser: Parser) -> None:
         default=os.environ.get("VLLM_RUNTIME_IMAGE"),
         help="Specify the runtime image to use for the tests",
     )
+    runtime_group.addoption(
+        "--mlserver-runtime-image",
+        default=os.environ.get("MLSERVER_RUNTIME_IMAGE"),
+        help="Specify the runtime image to use for the tests",
+    )
 
     # Upgrade options
     upgrade_group.addoption(

tests/conftest.py

@@ -7,6 +7,8 @@
 import pytest
 import shortuuid
 import yaml
+from _pytest._py.path import LocalPath
+from _pytest.legacypath import TempdirFactory
 from _pytest.tmpdir import TempPathFactory
 from ocp_resources.config_map import ConfigMap
 from ocp_resources.dsc_initialization import DSCInitialization
@@ -32,6 +34,7 @@
     create_ns,
     login_with_user_password,
     get_openshift_token,
+    download_oc_console_cli,
 )
 from utilities.constants import (
     AcceleratorType,
@@ -41,6 +44,7 @@
     Protocols,
 )
 from utilities.infra import update_configmap_data
+from utilities.logger import RedactedString
 from utilities.minio import create_minio_data_connection_secret
 from utilities.operator_utils import get_csv_related_images
 
@@ -65,7 +69,7 @@ def tests_tmp_dir(request: FixtureRequest, tmp_path_factory: TempPathFactory) ->
 
 @pytest.fixture(scope="session")
 def current_client_token(admin_client: DynamicClient) -> str:
-    return get_openshift_token()
+    return RedactedString(value=get_openshift_token())
 
 
 @pytest.fixture(scope="session")
@@ -217,6 +221,14 @@ def vllm_runtime_image(pytestconfig: pytest.Config) -> str | None:
     return runtime_image
 
 
+@pytest.fixture(scope="session")
+def mlserver_runtime_image(pytestconfig: pytest.Config) -> str | None:
+    runtime_image = pytestconfig.option.mlserver_runtime_image
+    if not runtime_image:
+        return None
+    return runtime_image
+
+
 @pytest.fixture(scope="session")
 def use_unprivileged_client(pytestconfig: pytest.Config) -> bool:
     _use_unprivileged_client = py_config.get("use_unprivileged_client")
@@ -490,8 +502,7 @@ def junitxml_plugin(
     return record_testsuite_property if request.config.pluginmanager.has_plugin("junitxml") else None
 
 
-@pytest.fixture(scope="session", autouse=True)
-@pytest.mark.early(order=0)
+@pytest.fixture(scope="session")
 def cluster_sanity_scope_session(
     request: FixtureRequest,
     nodes: list[Node],
@@ -525,3 +536,40 @@ def related_images_refs(admin_client: DynamicClient) -> set[str]:
     related_images = get_csv_related_images(admin_client=admin_client)
     related_images_refs = {img["image"] for img in related_images}
     return related_images_refs
+
+
+@pytest.fixture(scope="session")
+def os_path_environment() -> str:
+    return os.environ["PATH"]
+
+
+@pytest.fixture(scope="session")
+def bin_directory(tmpdir_factory: TempdirFactory) -> LocalPath:
+    return tmpdir_factory.mktemp(basename="bin")
+
+
+@pytest.fixture(scope="session")
+def bin_directory_to_os_path(os_path_environment: str, bin_directory: LocalPath, oc_binary_path: str) -> None:
+    LOGGER.info(f"OC binary path: {oc_binary_path}")
+    LOGGER.info(f"Adding {bin_directory} to $PATH")
+    os.environ["PATH"] = f"{bin_directory}:{os_path_environment}"
+
+
+@pytest.fixture(scope="session")
+def oc_binary_path(bin_directory: LocalPath) -> str:
+    installed_oc_binary_path = os.getenv("OC_BINARY_PATH")
+    if installed_oc_binary_path:
+        LOGGER.warning(f"Using previously installed: {installed_oc_binary_path}")
+        return installed_oc_binary_path
+
+    return download_oc_console_cli(tmpdir=bin_directory)
+
+
+@pytest.fixture(scope="session", autouse=True)
+@pytest.mark.early(order=0)
+def autouse_fixtures(
+    bin_directory_to_os_path: None,
+    cluster_sanity_scope_session: None,
+) -> None:
+    """Fixture to control the order of execution of some of the fixtures"""
+    return