Merge branch 'main' into update_agents

Author: dbasunag

.github/workflows/scripts/pr_workflow.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import re
 import sys
@@ -23,9 +24,8 @@
 from github.PullRequest import PullRequest
 from github.Repository import Repository
 from github.Team import Team
-from simple_logger.logger import get_logger
 
-LOGGER = get_logger(name="pr_labeler")
+LOGGER = logging.getLogger("pr_labeler")
 
 
 class PrBaseClass:

CONSTITUTION.md

@@ -79,6 +79,7 @@ All code MUST consider security implications.
 - Avoid running destructive commands without explicit user confirmation
 - Use detect-secrets and gitleaks pre-commit hooks to prevent secret leakage
 - Test code MUST NOT introduce vulnerabilities into the tested systems
+- Use `utilities.path_utils.resolve_repo_path` to resolve and validate any user-supplied or parameterized file paths, preventing path-traversal and symlink-escape outside the repository root
 - JIRA ticket links are allowed in PRs and commit messages (our Jira is public)
 - Do NOT reference internal-only resources (Jenkins, Confluence, Slack threads) in code, PRs, or commit messages
 - Do NOT link embargoed or security-restricted (RH-employee-only) tickets

pyproject.toml

@@ -6,7 +6,7 @@ output-format = "grouped"
 extend-exclude = ["utilities/manifests"]
 
 [tool.ruff.lint]
-external = ["E501"]
+external = ["E501", "FCN001"]
 
 [tool.ruff.format]
 exclude = [".git", ".venv", ".mypy_cache", ".tox", "__pycache__", "utilities/manifests"]
@@ -50,7 +50,7 @@ dependencies = [
     "openshift-python-utilities>=5.0.71",
     "pytest-dependency>=0.6.0",
     "pytest-progress",
-    "python-simple-logger",
+    "structlog>=24.1.0",
     "pyyaml",
     "tenacity",
     "types-requests>=2.32.0.20241016",

pytest.ini

@@ -4,8 +4,6 @@ testpaths = tests
 
 markers =
     # General
-    polarion: Store polarion test ID
-
     skip_on_disconnected: Mark tests that can only be run in deployments with Internet access i.e. not on disconnected clusters.
     parallel: marks tests that can run in parallel along with pytest-xdist
 

tests/cluster_health/README.md

@@ -0,0 +1,56 @@
+# Cluster Health Tests
+
+This directory contains foundational health check tests for OpenDataHub/RHOAI clusters. These tests serve as prerequisites to ensure the cluster and operators are in a healthy state before running more complex integration tests.
+
+## Directory Structure
+
+```text
+cluster_health/
+├── test_cluster_health.py      # Cluster node health validation
+└── test_operator_health.py     # Operator and pod health validation
+```
+
+### Current Test Suites
+
+- **`test_cluster_health.py`** - Validates that all cluster nodes are healthy and schedulable
+- **`test_operator_health.py`** - Validates that DSCInitialization, DataScienceCluster resources are ready, and all pods in operator/application namespaces are running
+
+## Test Markers
+
+Tests use the following markers defined in `pytest.ini`:
+
+- `@pytest.mark.cluster_health` - Tests that verify the cluster is healthy to begin testing
+- `@pytest.mark.operator_health` - Tests that verify OpenDataHub/RHOAI operators are healthy and functioning correctly
+
+## Test Details
+
+### Cluster Node Health (`test_cluster_health.py`)
+
+- **`test_cluster_node_healthy`** - Asserts all cluster nodes have `KubeletReady: True` condition and are schedulable (not cordoned)
+
+### Operator Health (`test_operator_health.py`)
+
+- **`test_data_science_cluster_initialization_healthy`** - Validates the DSCInitialization resource reaches `READY` status (120s timeout)
+- **`test_data_science_cluster_healthy`** - Validates the DataScienceCluster resource reaches `READY` status (120s timeout)
+- **`test_pods_cluster_healthy`** - Validates all pods in operator and application namespaces reach Running/Completed state (180s timeout). Parametrized across `operator_namespace` and `applications_namespace` from global config
+
+## Running Tests
+
+### Run All Cluster Health Tests
+
+```bash
+uv run pytest tests/cluster_health/
+```
+
+### Run by Marker
+
+```bash
+# Run cluster node health tests
+uv run pytest -m cluster_health
+
+# Run operator health tests
+uv run pytest -m operator_health
+
+# Run both
+uv run pytest -m "cluster_health or operator_health"
+```

tests/cluster_health/test_cluster_health.py

@@ -1,7 +1,8 @@
 import pytest
 from ocp_resources.node import Node
 from ocp_utilities.infra import assert_nodes_in_healthy_condition, assert_nodes_schedulable
-from simple_logger.logger import get_logger
+
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/cluster_health/test_operator_health.py

@@ -3,10 +3,10 @@
 from ocp_resources.data_science_cluster import DataScienceCluster
 from ocp_resources.dsc_initialization import DSCInitialization
 from pytest_testconfig import config as py_config
-from simple_logger.logger import get_logger
 
 from utilities.general import wait_for_pods_running
 from utilities.infra import wait_for_dsc_status_ready, wait_for_dsci_status_ready
+from utilities.opendatahub_logger import get_logger
 
 LOGGER = get_logger(name=__name__)
 

tests/conftest.py

@@ -37,7 +37,6 @@
 from pytest import Config, FixtureRequest
 from pytest_testconfig import config as py_config
 from semver import Version
-from simple_logger.logger import get_logger
 
 from utilities.certificates_utils import create_ca_bundle_file
 from utilities.constants import (
@@ -65,6 +64,7 @@
 from utilities.logger import RedactedString
 from utilities.mariadb_utils import wait_for_mariadb_operator_deployments
 from utilities.minio import create_minio_data_connection_secret
+from utilities.opendatahub_logger import get_logger
 from utilities.operator_utils import get_cluster_service_version, get_csv_related_images
 from utilities.serving_runtime import get_runtime_image_from_template
 from utilities.user_utils import get_byoidc_issuer_url, get_oidc_tokens

tests/fixtures/README.md

@@ -0,0 +1,74 @@
+# Shared Test Fixtures
+
+This directory contains shared pytest fixtures that are used across multiple test modules. These fixtures are automatically loaded via pytest's plugin mechanism, registered in `/tests/conftest.py`.
+
+## Directory Structure
+
+```text
+fixtures/
+├── files.py           # File storage provider fixtures
+├── guardrails.py      # Guardrails orchestrator infrastructure fixtures
+├── inference.py       # Inference service and serving runtime fixtures
+├── trustyai.py        # TrustyAI operator and DSC configuration fixtures
+└── vector_io.py       # Vector database provider deployment fixtures
+```
+
+### Fixture Modules
+
+- **`files.py`** - Factory fixture for configuring file storage providers (local, S3/MinIO)
+- **`guardrails.py`** - Fixtures for deploying and configuring the Guardrails Orchestrator, including pods, routes, health checks, and gateway configuration
+- **`inference.py`** - Fixtures for vLLM CPU serving runtimes, InferenceServices (Qwen), LLM-d inference simulator, and KServe controller configuration
+- **`trustyai.py`** - Fixtures for TrustyAI operator deployment and DataScienceCluster LMEval configuration
+- **`vector_io.py`** - Factory fixture for deploying vector database providers (Milvus, Faiss, PGVector, Qdrant) with their backing services and configuration
+
+## Registration
+
+All fixture modules are registered as pytest plugins in `/tests/conftest.py`:
+
+```python
+pytest_plugins = [
+    "tests.fixtures.inference",
+    "tests.fixtures.guardrails",
+    "tests.fixtures.trustyai",
+    "tests.fixtures.vector_io",
+    "tests.fixtures.files",
+]
+```
+
+## Usage
+
+Fixtures are automatically available to all tests. Factory fixtures accept parameters via `pytest.mark.parametrize` with `indirect=True`.
+
+### Vector I/O Provider Example
+
+```python
+@pytest.mark.parametrize(
+    "vector_io_provider_deployment_config_factory",
+    ["milvus", "pgvector", "qdrant-remote"],
+    indirect=True,
+)
+def test_with_vector_db(vector_io_provider_deployment_config_factory):
+    # Fixture deploys the provider and returns env var configuration
+    ...
+```
+
+### Supported Vector I/O Providers
+
+| Provider        | Type   | Description                                 |
+| --------------- | ------ | ------------------------------------------- |
+| `milvus`        | Local  | In-memory Milvus (no external dependencies) |
+| `milvus-remote` | Remote | Milvus standalone with etcd backend         |
+| `faiss`         | Local  | Facebook AI Similarity Search (in-memory)   |
+| `pgvector`      | Local  | PostgreSQL with pgvector extension          |
+| `qdrant-remote` | Remote | Qdrant vector database                      |
+
+### Supported File Providers
+
+| Provider | Description                        |
+| -------- | ---------------------------------- |
+| `local`  | Local filesystem storage (default) |
+| `s3`     | S3/MinIO remote object storage     |
+
+## Adding New Fixtures
+
+When adding shared fixtures, place them in the appropriate module file (or create a new one), and register the new module in `/tests/conftest.py` under `pytest_plugins`. Follow the project's fixture conventions: use noun-based names, narrowest appropriate scope, and context managers for resource lifecycle.

tests/fixtures/inference.py

@@ -13,7 +13,6 @@
 from ocp_resources.service import Service
 from ocp_resources.serving_runtime import ServingRuntime
 from pytest_testconfig import py_config
-from simple_logger.logger import get_logger
 from timeout_sampler import retry
 
 from utilities.constants import (
@@ -24,6 +23,7 @@
 )
 from utilities.inference_utils import create_isvc
 from utilities.infra import get_data_science_cluster, wait_for_dsc_status_ready
+from utilities.opendatahub_logger import get_logger
 from utilities.serving_runtime import ServingRuntimeFromTemplate
 
 LOGGER = get_logger(name=__name__)