Merge branch 'main' into test/api-key-expiration

Author: dbasunag

.coderabbit.yaml

@@ -5,6 +5,16 @@
 inheritance: true
 
 reviews:
+  path_instructions:
+    - path: "**/*.py"
+      instructions: |
+        - This project targets Python 3.14 (requires-python = '==3.14.*').
+        - Per PEP 758 (https://peps.python.org/pep-0758/), bare 'except ExcA, ExcB:' without parentheses is valid syntax in Python 3.14+ and means catching both exceptions. Do not flag this as a Python 2-style except clause or suggest adding parentheses.
+        - Focus on security, test structure and coding style adherence in new code introduced
+        - Code should follow python, pytest best practices
+        - Ensure we use https://github.com/RedHatQE/openshift-python-wrapper/ instead of direct oc calls when possible
+        - Code reuse, test parameterization, proper test dependency should be also encouraged
+        - Check CONSTITUTION and AGENTS files
   review_status: false
   changed_files_summary: true
   suggested_labels: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,10 +14,16 @@ assignees: ''
 
 <!-- Add any steps to reproduce the issue being reported or add any relevant stacktrace -->
 
+## Expected behavior
+
+A clear and concise description of what you expected to happen.
+
 ## Proposed Solution
 
 <!-- If you have a suggestion for how to fix this, describe it here -->
 
 ## Additional Context
 
-<!-- Any other information that might be helpful -->
+### Environment
+
+<!-- Any other information that might be helpful, including environment -->

.github/pull_request_template.md

@@ -10,7 +10,7 @@
 - Fixes: <!-- github issue -->
 - JIRA: <!-- Jira information -->
 
-## How it has been tested
+## Please review and indicate how it has been tested
 
 - [ ] Locally
 - [ ] Jenkins

conftest.py

@@ -54,6 +54,7 @@ def pytest_addoption(parser: Parser) -> None:
     serving_arguments_group = parser.getgroup(name="Serving arguments")
     model_validation_automation_group = parser.getgroup(name="Model Validation Automation")
     hf_group = parser.getgroup(name="Hugging Face")
+    logging_group = parser.getgroup(name="Logging")
     model_registry_group = parser.getgroup(name="Model Registry options")
     # AWS config and credentials options
     aws_group.addoption(
@@ -206,6 +207,14 @@ def pytest_addoption(parser: Parser) -> None:
         help="Indicates if the model registry tests are to be run against custom namespace",
     )
 
+    # Logging options
+    logging_group.addoption(
+        "--readable-logs",
+        action="store_true",
+        default=False,
+        help="Write logs in human-readable format instead of JSON",
+    )
+
 
 def pytest_cmdline_main(config: Any) -> None:
     config.option.basetemp = py_config["tmp_base_dir"] = f"{config.option.basetemp}-{shortuuid.uuid()}"
@@ -326,6 +335,7 @@ def pytest_sessionstart(session: Session) -> None:
         log_level=log_level,
         thread_name=thread_name,
         enable_console=enable_console_value,
+        human_readable=session.config.getoption("--readable-logs"),
     )
 
     # Now safe to log after configuration is applied (only to file when console disabled)

docs/GETTING_STARTED.md

@@ -168,3 +168,28 @@ To run tests in containerized environment:
 ```bash
 podman run  -v $HOME:/mnt/host:Z  -e KUBECONFIG=/mnt/host/kubeconfig quay.io/opendatahub/opendatahub-tests
 ```
+
+## Debugging test failures
+
+### Human-readable log output
+
+By default, logs are written in JSON format to `pytest-tests.log`. To write logs in human-readable format instead, use the `--readable-logs` flag:
+
+```bash
+uv run pytest --readable-logs tests/my_test.py
+```
+
+This produces output like:
+
+```text
+2026-03-25T10:48:56.864955+00:00 conftest INFO Writing tests log to pytest-tests.log (conftest.py:342)
+2026-03-25T10:48:56.881095+00:00 ocp_resources.resource INFO Trying to get client via new_client_from_config (resource.py:272)
+```
+
+### Converting existing JSON logs
+
+To convert an existing JSON log file to readable format:
+
+```bash
+sed 's/^[^{]*//' pytest-tests.log | jq -r '"\(.timestamp) [\(.level)] \(.logger): \(.event)"'
+```

tests/model_explainability/evalhub/test_evalhub_health.py

@@ -1,22 +1,22 @@
 import pytest
 from ocp_resources.route import Route
 
-from tests.model_explainability.evalhub.utils import validate_evalhub_health
+from tests.model_explainability.evalhub.utils import validate_evalhub_health, validate_evalhub_providers
 
 
 @pytest.mark.parametrize(
     "model_namespace",
     [
         pytest.param(
-            {"name": "test-evalhub-health"},
+            {"name": "test-evalhub-health-providers"},
         ),
     ],
     indirect=True,
 )
 @pytest.mark.smoke
 @pytest.mark.model_explainability
-class TestEvalHubHealth:
-    """Tests for basic EvalHub service health and availability."""
+class TestEvalHub:
+    """Tests for basic EvalHub service health and providers."""
 
     def test_evalhub_health_endpoint(
         self,
@@ -30,3 +30,19 @@ def test_evalhub_health_endpoint(
             token=current_client_token,
             ca_bundle_file=evalhub_ca_bundle_file,
         )
+
+    def test_evalhub_providers_list(
+        self,
+        current_client_token: str,
+        evalhub_ca_bundle_file: str,
+        evalhub_route: Route,
+        model_namespace,
+    ) -> None:
+        """Test that the evaluations providers endpoint returns a non-empty list."""
+
+        validate_evalhub_providers(
+            host=evalhub_route.host,
+            token=current_client_token,
+            ca_bundle_file=evalhub_ca_bundle_file,
+            tenant=model_namespace.name,
+        )

tests/model_explainability/evalhub/utils.py

@@ -3,12 +3,31 @@
 from tests.model_explainability.evalhub.constants import (
     EVALHUB_HEALTH_PATH,
     EVALHUB_HEALTH_STATUS_HEALTHY,
+    EVALHUB_PROVIDERS_PATH,
 )
 from utilities.guardrails import get_auth_headers
 from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 
+TENANT_HEADER: str = "X-Tenant"
+
+
+def _build_headers(token: str, tenant: str | None = None) -> dict[str, str]:
+    """Build request headers with auth and optional tenant.
+
+    Args:
+        token: Bearer token for authentication.
+        tenant: Namespace for the X-Tenant header. Omitted if None.
+
+    Returns:
+        Headers dict.
+    """
+    headers = get_auth_headers(token=token)
+    if tenant is not None:
+        headers[TENANT_HEADER] = tenant
+    return headers
+
 
 def validate_evalhub_health(
     host: str,
@@ -45,3 +64,26 @@ def validate_evalhub_health(
         f"Expected status '{EVALHUB_HEALTH_STATUS_HEALTHY}', got '{data['status']}'"
     )
     assert "timestamp" in data, "Health response missing 'timestamp' field"
+
+
+def validate_evalhub_providers(
+    host: str,
+    token: str,
+    ca_bundle_file: str,
+    tenant: str | None = None,
+) -> dict:
+    """Smoke test for the EvalHub providers endpoint."""
+    url = f"https://{host}{EVALHUB_PROVIDERS_PATH}"
+
+    response = requests.get(
+        url=url,
+        headers=_build_headers(token=token, tenant=tenant),
+        verify=ca_bundle_file,
+        timeout=10,
+    )
+    response.raise_for_status()
+
+    data = response.json()
+    assert data.get("items"), f"Smoke test failed: Providers list is empty for tenant {tenant}"
+
+    return data

tests/model_registry/conftest.py

@@ -25,7 +25,7 @@
 from tests.model_registry.constants import (
     DB_BASE_RESOURCES_NAME,
     DB_RESOURCE_NAME,
-    DEFAULT_CUSTOM_MODEL_CATALOG,
+    DEFAULT_MCP_CATALOG_CM,
     KUBERBACPROXY_STR,
     MR_INSTANCE_BASE_NAME,
     MR_INSTANCE_NAME,
@@ -493,15 +493,15 @@ def mcp_servers_configmap_patch(
     model_registry_rest_headers: dict[str, str],
 ) -> Generator[None]:
     """
-    Class-scoped fixture that patches the model-catalog-sources ConfigMap.
+    Class-scoped fixture that patches the mcp-catalog-sources ConfigMap.
 
     Sets two keys in the ConfigMap data:
     - sources.yaml: catalog source definition pointing to the MCP servers YAML,
       plus named queries for filtering by custom properties
     - mcp-servers.yaml: the actual MCP server definitions
     """
     catalog_config_map = ConfigMap(
-        name=DEFAULT_CUSTOM_MODEL_CATALOG,
+        name=DEFAULT_MCP_CATALOG_CM,
         client=admin_client,
         namespace=model_registry_namespace,
     )

tests/model_registry/constants.py

@@ -67,6 +67,7 @@ class ModelRegistryEndpoints:
 }
 MODEL_REGISTRY_POD_FILTER: str = "component=model-registry"
 DEFAULT_CUSTOM_MODEL_CATALOG: str = "model-catalog-sources"
+DEFAULT_MCP_CATALOG_CM: str = "mcp-catalog-sources"
 SAMPLE_MODEL_NAME1 = "mistralai/Mistral-7B-Instruct-v0.3"
 CUSTOM_CATALOG_ID1: str = "sample_custom_catalog1"
 DEFAULT_MODEL_CATALOG_CM: str = "model-catalog-default-sources"

tests/model_registry/mcp_servers/config/conftest.py

@@ -35,7 +35,7 @@ def mcp_multi_source_configmap_patch(
     model_registry_rest_headers: dict[str, str],
 ) -> Generator[None]:
     """
-    Class-scoped fixture that patches the model-catalog-sources ConfigMap
+    Class-scoped fixture that patches the mcp-catalog-sources ConfigMap
     with two MCP catalog sources pointing to two different YAML files.
     """
     catalog_config_map, current_data = get_mcp_catalog_sources(