ci: Merge branch 'main' of github.com:fege/opendatahub-tests into mcp_regression

Signed-off-by: fege <fmosca@redhat.com>

Author: fege

docs/GETTING_STARTED.md

@@ -138,7 +138,7 @@ To run tests with admin client only, pass `--tc=use_unprivileged_client:False` t
 ### jira integration
 
 To skip running tests which have open bugs, [pytest_jira](https://github.com/rhevm-qe-automation/pytest_jira) plugin is used.
-To run tests with jira integration, you need to set `PYTEST_JIRA_URL` and `PYTEST_JIRA_TOKEN` environment variables.
+To run tests with jira integration, you need to set `PYTEST_JIRA_URL`, `PYTEST_JIRA_USERNAME` and `PYTEST_JIRA_TOKEN` environment variables.
 To make a test with jira marker, add: `@pytest.mark.jira(jira_id="RHOAIENG-0000", run=False)` to the test.
 
 ### Running containerized tests

tests/llama_stack/conftest.py

@@ -229,48 +229,6 @@ def test_with_remote_milvus(llama_stack_server_config):
     if trustyai_embedding_model:
         env_vars.append({"name": "TRUSTYAI_EMBEDDING_MODEL", "value": trustyai_embedding_model})
 
-    # Kubeflow-related environment variables
-    if params.get("enable_ragas_remote"):
-        # Get fixtures only when Ragas Remote/Kubeflow is enabled
-        model_namespace = request.getfixturevalue(argname="model_namespace")
-        current_client_token = request.getfixturevalue(argname="current_client_token")
-        dspa_route = request.getfixturevalue(argname="dspa_route")
-        dspa_s3_secret = request.getfixturevalue(argname="dspa_s3_secret")
-
-        # KUBEFLOW_LLAMA_STACK_URL: Build from LlamaStackDistribution service
-        env_vars.append({
-            "name": "KUBEFLOW_LLAMA_STACK_URL",
-            "value": f"http://{distribution_name}-service.{model_namespace.name}.svc.cluster.local:8321",
-        })
-
-        # KUBEFLOW_PIPELINES_ENDPOINT: Get from DSPA route
-        env_vars.append({"name": "KUBEFLOW_PIPELINES_ENDPOINT", "value": f"https://{dspa_route.instance.spec.host}"})
-
-        # KUBEFLOW_NAMESPACE: Use model namespace
-        env_vars.append({"name": "KUBEFLOW_NAMESPACE", "value": model_namespace.name})
-
-        # KUBEFLOW_BASE_IMAGE
-        env_vars.append({
-            "name": "KUBEFLOW_BASE_IMAGE",
-            "value": params.get(
-                "kubeflow_base_image",
-                "quay.io/diegosquayorg/my-ragas-provider-image"
-                "@sha256:3749096c47f7536d6be2a7932e691abebacd578bafbe65bad2f7db475e2b93fb",
-            ),
-        })
-
-        # KUBEFLOW_RESULTS_S3_PREFIX: Build from MinIO bucket
-        env_vars.append({
-            "name": "KUBEFLOW_RESULTS_S3_PREFIX",
-            "value": params.get("kubeflow_results_s3_prefix", "s3://llms/ragas-results"),
-        })
-
-        # KUBEFLOW_S3_CREDENTIALS_SECRET_NAME: Use DSPA secret name
-        env_vars.append({"name": "KUBEFLOW_S3_CREDENTIALS_SECRET_NAME", "value": dspa_s3_secret.name})
-
-        # KUBEFLOW_PIPELINES_TOKEN: Get from current client token
-        env_vars.append({"name": "KUBEFLOW_PIPELINES_TOKEN", "value": str(current_client_token)})
-
     # POSTGRESQL environment variables for sql_default and kvstore_default
     env_vars.append({"name": "POSTGRES_HOST", "value": "vector-io-postgres-service"})
     env_vars.append({"name": "POSTGRES_PORT", "value": "5432"})

tests/llama_stack/constants.py

@@ -17,8 +17,6 @@ class Safety(str, Enum):
 
     class Eval(str, Enum):
         TRUSTYAI_LMEVAL = "trustyai_lmeval"
-        TRUSTYAI_RAGAS_INLINE = "trustyai_ragas_inline"
-        TRUSTYAI_RAGAS_REMOTE = "trustyai_ragas_remote"
 
 
 class ModelInfo(NamedTuple):

tests/llama_stack/eval/conftest.py

@@ -3,18 +3,11 @@
 
 import pytest
 from kubernetes.dynamic import DynamicClient
-from ocp_resources.data_science_pipelines_application import DataSciencePipelinesApplication
 from ocp_resources.namespace import Namespace
 from ocp_resources.persistent_volume_claim import PersistentVolumeClaim
 from ocp_resources.pod import Pod
-from ocp_resources.route import Route
-from ocp_resources.secret import Secret
-from ocp_resources.service import Service
-from timeout_sampler import TimeoutSampler
 
 from tests.llama_stack.eval.constants import DK_CUSTOM_DATASET_IMAGE
-from tests.llama_stack.eval.utils import wait_for_dspa_pods
-from utilities.constants import MinIo
 
 
 @pytest.fixture(scope="class")
@@ -117,141 +110,3 @@ def teardown_lmeval_job_pod(admin_client, model_namespace) -> None:
     ]:
         for pod in pods:
             pod.delete()
-
-
-@pytest.fixture(scope="class")
-def dspa(
-    pytestconfig: pytest.Config,
-    admin_client: DynamicClient,
-    model_namespace: Namespace,
-    minio_pod: Pod,
-    minio_service: Service,
-    dspa_s3_secret: Secret,
-    teardown_resources: bool,
-) -> Generator[DataSciencePipelinesApplication, Any, Any]:
-    """
-    Creates a DataSciencePipelinesApplication with MinIO object storage.
-    """
-
-    dspa_resource = DataSciencePipelinesApplication(
-        client=admin_client,
-        name="dspa",
-        namespace=model_namespace.name,
-        dsp_version="v2",
-        pod_to_pod_tls=True,
-        api_server={
-            "deploy": True,
-            "enableOauth": True,
-            "enableSamplePipeline": False,
-            "cacheEnabled": True,
-            "artifactSignedURLExpirySeconds": 60,
-            "pipelineStore": "kubernetes",
-        },
-        database={
-            "disableHealthCheck": False,
-            "mariaDB": {
-                "deploy": True,
-                "pipelineDBName": "mlpipeline",
-                "pvcSize": "10Gi",
-                "username": "mlpipeline",
-            },
-        },
-        object_storage={
-            "disableHealthCheck": False,
-            "enableExternalRoute": False,
-            "externalStorage": {
-                "bucket": "ods-ci-ds-pipelines",
-                "host": f"{minio_service.instance.spec.clusterIP}:{MinIo.Metadata.DEFAULT_PORT}",
-                "region": "us-east-1",
-                "scheme": "http",
-                "s3CredentialsSecret": {
-                    "accessKey": "AWS_ACCESS_KEY_ID",  # pragma: allowlist secret
-                    "secretKey": "AWS_SECRET_ACCESS_KEY",  # pragma: allowlist secret
-                    "secretName": dspa_s3_secret.name,
-                },
-            },
-        },
-        persistence_agent={
-            "deploy": True,
-            "numWorkers": 2,
-        },
-        scheduled_workflow={
-            "deploy": True,
-            "cronScheduleTimezone": "UTC",
-        },
-        ensure_exists=pytestconfig.option.post_upgrade,
-        teardown=teardown_resources,
-    )
-    if pytestconfig.option.post_upgrade:
-        wait_for_dspa_pods(
-            admin_client=admin_client,
-            namespace=model_namespace.name,
-            dspa_name=dspa_resource.name,
-        )
-        yield dspa_resource
-        dspa_resource.clean_up()
-    else:
-        with dspa_resource:
-            wait_for_dspa_pods(
-                admin_client=admin_client,
-                namespace=model_namespace.name,
-                dspa_name=dspa_resource.name,
-            )
-            yield dspa_resource
-
-
-@pytest.fixture(scope="class")
-def dspa_s3_secret(
-    pytestconfig: pytest.Config,
-    admin_client: DynamicClient,
-    model_namespace: Namespace,
-    minio_service: Service,
-    teardown_resources: bool,
-) -> Generator[Secret, Any, Any]:
-    """
-    Creates a secret for DSPA S3 credentials using MinIO.
-    """
-    secret = Secret(
-        client=admin_client,
-        name="dashboard-dspa-secret",
-        namespace=model_namespace.name,
-        string_data={
-            "AWS_ACCESS_KEY_ID": MinIo.Credentials.ACCESS_KEY_VALUE,
-            "AWS_SECRET_ACCESS_KEY": MinIo.Credentials.SECRET_KEY_VALUE,
-            "AWS_DEFAULT_REGION": "us-east-1",
-        },
-        ensure_exists=pytestconfig.option.post_upgrade,
-        teardown=teardown_resources,
-    )
-    if pytestconfig.option.post_upgrade:
-        yield secret
-        secret.clean_up()
-    else:
-        with secret:
-            yield secret
-
-
-@pytest.fixture(scope="class")
-def dspa_route(
-    admin_client: DynamicClient,
-    model_namespace: Namespace,
-    dspa: DataSciencePipelinesApplication,
-) -> Generator[Route, Any, Any]:
-    """
-    Retrieves the Route for the DSPA API server.
-    """
-
-    def _get_dspa_route() -> Route | None:
-        routes = list(
-            Route.get(
-                client=admin_client,
-                namespace=model_namespace.name,
-                name="ds-pipeline-dspa",
-            )
-        )
-        return routes[0] if routes else None
-
-    for route in TimeoutSampler(wait_timeout=240, sleep=5, func=_get_dspa_route):
-        if route:
-            yield route
-            return