Merge remote-tracking branch 'origin' into push_container_image_on_merge

Author: dbasunag

.github/README.md

@@ -6,6 +6,7 @@
 - Run `tox`
 - Close stale PRs
 - Check for offensive language
+- Assign the PR to the author
 
 ### On user action
 - Add to or remove a label from PR; supported labels: `wip`, `lgtm`, `verified`, and `hold`.  
@@ -23,7 +24,6 @@
 
 ## To be added
 - Block merging if not all defined checks pass. For example: a `verified` label was added and at least 2 approvals.
-- When a PR is opened, assign the PR to the PR owner
 - When a PR is opened, add reviewers (requires updates to OWNERS file(s))
 - When a PR is reviewed/commented by a user who's not the PR owner, add `reviewed|commented|approved-by-<username>` label
 - When a PR is ready to be merged (all checks passed), add `ready-to-merge` label

.github/workflows/add-welcome-comment.yml …ows/add-welcome-comment-set-assignee.yml.github/workflows/add-welcome-comment.yml renamed to .github/workflows/add-welcome-comment-set-assignee.yml .github/workflows/add-welcome-comment.yml renamed to .github/workflows/add-welcome-comment-set-assignee.yml

@@ -1,4 +1,4 @@
-name: Add Welcome Comment
+name: Add Welcome Comment And Set PR Assignee
 on:
   pull_request_target:
     types: [opened]
@@ -8,7 +8,7 @@ permissions:
   contents: write
 
 jobs:
-  add-welcome-comment:
+  add-welcome-comment-set-assignee:
     runs-on: ubuntu-latest
 
     steps:
@@ -23,5 +23,5 @@ jobs:
           GITHUB_PR_NUMBER: ${{github.event.pull_request.number}}
           GITHUB_EVENT_ACTION: ${{github.event.action}}
           GITHUB_EVENT_NAME: ${{github.event_name}}
-          ACTION: "add-welcome-comment"
+          ACTION: "add-welcome-comment-set-assignee"
         run: uv run python .github/workflows/scripts/pr_workflow.py

.github/workflows/scripts/constants.py

@@ -25,6 +25,7 @@
  * PR size label.
  * Run [pre-commit](https://pre-commit.ci/)
  * Run [tox](https://tox.wiki/)
+ * Add PR author as the PR assignee
 
 Available user actions:
  * To mark a PR as `WIP`, add `/wip` in a comment. To remove it from the PR comment `/wip cancel` to the PR.

.github/workflows/scripts/pr_workflow.py

@@ -31,7 +31,7 @@ class PrBaseClass:
     class SupportedActions:
         add_remove_labels_action_name: str = "add-remove-labels"
         pr_size_action_name: str = "add-pr-size-label"
-        welcome_comment_action_name: str = "add-welcome-comment"
+        welcome_comment_action_name: str = "add-welcome-comment-set-assignee"
         supported_actions: set[str] = {
             pr_size_action_name,
             add_remove_labels_action_name,
@@ -115,7 +115,7 @@ def run_pr_label_action(self) -> None:
             self.add_remove_pr_labels()
 
         if self.action == self.SupportedActions.welcome_comment_action_name:
-            self.add_welcome_comment()
+            self.add_welcome_comment_set_assignee()
 
     def get_pr_size(self) -> int:
         additions: int = 0
@@ -294,8 +294,9 @@ def issue_comment_label_actions(
             if commented_by_label not in self.pr_labels:
                 self.add_pr_label(label=commented_by_label)
 
-    def add_welcome_comment(self) -> None:
+    def add_welcome_comment_set_assignee(self) -> None:
         self.pr.create_issue_comment(body=WELCOME_COMMENT)
+        self.pr.add_to_assignees(self.pr.user.login)
 
 
 def main() -> None:

.pre-commit-config.yaml

@@ -35,7 +35,7 @@ repos:
       - id: detect-secrets
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.0
+    rev: v0.11.2
     hooks:
       - id: ruff
       - id: ruff-format
@@ -49,7 +49,7 @@ repos:
   #     - id: renovate-config-validator
 
   - repo: https://github.com/gitleaks/gitleaks
-    rev: v8.24.0
+    rev: v8.24.2
     hooks:
       - id: gitleaks
 

conftest.py

@@ -32,6 +32,7 @@ def pytest_addoption(parser: Parser) -> None:
     buckets_group = parser.getgroup(name="Buckets")
     runtime_group = parser.getgroup(name="Runtime details")
     upgrade_group = parser.getgroup(name="Upgrade options")
+    platform_group = parser.getgroup(name="Platform")
 
     # AWS config and credentials options
     aws_group.addoption(
@@ -113,6 +114,12 @@ def pytest_addoption(parser: Parser) -> None:
         "If not set, all will be tested.",
     )
 
+    # Platform options
+    platform_group.addoption(
+        "--applications-namespace",
+        help="RHOAI/ODH applications namespace",
+    )
+
 
 def pytest_cmdline_main(config: Any) -> None:
     config.option.basetemp = py_config["tmp_base_dir"] = f"{config.option.basetemp}-{shortuuid.uuid()}"
@@ -196,9 +203,6 @@ def pytest_sessionstart(session: Session) -> None:
         log_level=session.config.getoption("log_cli_level") or logging.INFO,
     )
 
-    if py_config.get("distribution") == "upstream":
-        py_config["applications_namespace"] = "opendatahub"
-
 
 def pytest_fixture_setup(fixturedef: FixtureDef[Any], request: FixtureRequest) -> None:
     LOGGER.info(f"Executing {fixturedef.scope} fixture: {fixturedef.argname}")
@@ -207,8 +211,9 @@ def pytest_fixture_setup(fixturedef: FixtureDef[Any], request: FixtureRequest) -
 def pytest_runtest_setup(item: Item) -> None:
     """
     Performs the following actions:
-    1. Adds skip fixture for kserve if serverless or authorino operators are not installed.
-    2. Adds skip fixture for serverless if authorino/serverless/service mesh are not deployed.
+    1. Updates global config (`updated_global_config`)
+    2. Adds skip fixture for kserve if serverless or authorino operators are not installed.
+    3. Adds skip fixture for serverless if authorino/serverless/service mesh are not deployed.
     """
 
     BASIC_LOGGER.info(f"\n{separator(symbol_='-', val=item.name)}")
@@ -226,6 +231,9 @@ def pytest_runtest_setup(item: Item) -> None:
     elif KServeDeploymentType.MODEL_MESH.lower() in item.keywords:
         item.fixturenames.insert(0, "enabled_modelmesh_in_dsc")
 
+    # The above fixtures require the global config to be updated before being called
+    item.fixturenames.insert(0, "updated_global_config")
+
 
 def pytest_runtest_call(item: Item) -> None:
     BASIC_LOGGER.info(f"{separator(symbol_='-', val='CALL')}")

pyproject.toml

@@ -63,7 +63,7 @@ dependencies = [
     "timeout-sampler>=1.0.6",
     "shortuuid>=1.0.13",
     "jira>=3.8.0",
-    "openshift-python-wrapper>=11.0.26",
+    "openshift-python-wrapper>=11.0.38",
     "semver>=3.0.4",
 ]
 

tests/conftest.py

@@ -21,7 +21,13 @@
 from simple_logger.logger import get_logger
 
 from utilities.data_science_cluster_utils import update_components_in_dsc
-from utilities.infra import create_ns, login_with_user_password, get_openshift_token
+from utilities.infra import (
+    create_ns,
+    get_dsci_applications_namespace,
+    get_operator_distribution,
+    login_with_user_password,
+    get_openshift_token,
+)
 from utilities.constants import AcceleratorType, DscComponents
 from utilities.infra import update_configmap_data
 
@@ -45,6 +51,21 @@ def tests_tmp_dir(request: FixtureRequest, tmp_path_factory: TempPathFactory) ->
     shutil.rmtree(path=str(tests_tmp_path), ignore_errors=True)
 
 
+@pytest.fixture(scope="session")
+def updated_global_config(request: FixtureRequest, admin_client: DynamicClient) -> None:
+    if get_operator_distribution(client=admin_client) == "Open Data Hub":
+        py_config["distribution"] = "upstream"
+
+    else:
+        py_config["distribution"] = "downstream"
+
+    if applications_namespace := request.config.getoption("applications_namespace"):
+        py_config["applications_namespace"] = applications_namespace
+
+    else:
+        py_config["applications_namespace"] = get_dsci_applications_namespace(client=admin_client)
+
+
 @pytest.fixture(scope="session")
 def current_client_token(admin_client: DynamicClient) -> str:
     return get_openshift_token()
@@ -275,6 +296,17 @@ def enabled_modelmesh_in_dsc(dsc_resource: DataScienceCluster) -> Generator[Data
         yield dsc
 
 
+@pytest.fixture(scope="package")
+def enabled_kserve_in_dsc(
+    dsc_resource: DataScienceCluster,
+) -> Generator[DataScienceCluster, Any, Any]:
+    with update_components_in_dsc(
+        dsc=dsc_resource,
+        components={DscComponents.KSERVE: DscComponents.ManagementState.MANAGED},
+    ) as dsc:
+        yield dsc
+
+
 @pytest.fixture(scope="session")
 def cluster_monitoring_config(admin_client: DynamicClient) -> Generator[ConfigMap, Any, Any]:
     data = {"config.yaml": yaml.dump({"enableUserWorkload": True})}
@@ -304,5 +336,8 @@ def unprivileged_model_namespace(
         request.getfixturevalue(argname="enabled_modelmesh_in_dsc")
         ns_kwargs["model_mesh_enabled"] = True
 
+    if (_dashboard_label := request.param.get("dashboard-label")) is not None:
+        ns_kwargs["add_dashboard_label"] = _dashboard_label
+
     with create_ns(**ns_kwargs) as ns:
         yield ns

tests/model_explainability/conftest.py

@@ -0,0 +1,54 @@
+from typing import Generator, Any
+
+import pytest
+from _pytest.fixtures import FixtureRequest
+from kubernetes.dynamic import DynamicClient
+from ocp_resources.namespace import Namespace
+from ocp_resources.secret import Secret
+from ocp_resources.service import Service
+
+from tests.model_explainability.constants import MINIO, MINIO_PORT
+
+OPENDATAHUB_IO: str = "opendatahub.io"
+
+
+@pytest.fixture(scope="class")
+def minio_service(admin_client: DynamicClient, model_namespace: Namespace) -> Generator[Service, Any, Any]:
+    with Service(
+        client=admin_client,
+        name=MINIO,
+        namespace=model_namespace.name,
+        ports=[
+            {
+                "name": "minio-client-port",
+                "port": MINIO_PORT,
+                "protocol": "TCP",
+                "targetPort": MINIO_PORT,
+            }
+        ],
+        selector={
+            "app": MINIO,
+        },
+    ) as minio_service:
+        yield minio_service
+
+
+@pytest.fixture(scope="class")
+def minio_data_connection(
+    request: FixtureRequest, admin_client: DynamicClient, model_namespace: Namespace, minio_service: Service
+) -> Generator[Secret, Any, Any]:
+    with Secret(
+        client=admin_client,
+        name="aws-connection-minio-data-connection",
+        namespace=model_namespace.name,
+        data_dict=request.param["data-dict"],
+        label={
+            f"{OPENDATAHUB_IO}/dashboard": "true",
+            f"{OPENDATAHUB_IO}/managed": "true",
+        },
+        annotations={
+            f"{OPENDATAHUB_IO}/connection-type": "s3",
+            "openshift.io/display-name": "Minio Data Connection",
+        },
+    ) as minio_secret:
+        yield minio_secret

tests/model_explainability/constants.py

@@ -0,0 +1,17 @@
+from utilities.general import get_s3_secret_dict
+
+MINIO: str = "minio"
+MINIO_PORT: int = 9000
+
+MINIO_ACCESS_KEY: str = "MINIO_ACCESS_KEY"
+MINIO_ACCESS_KEY_VALUE: str = "THEACCESSKEY"
+MINIO_SECRET_KEY: str = "MINIO_SECRET_KEY"
+MINIO_SECRET_KEY_VALUE: str = "THESECRETKEY"
+
+MINIO_DATA_DICT: dict[str, str] = get_s3_secret_dict(
+    aws_access_key=MINIO_ACCESS_KEY_VALUE,
+    aws_secret_access_key=MINIO_SECRET_KEY_VALUE,  # pragma: allowlist secret
+    aws_s3_bucket="modelmesh-example-models",
+    aws_s3_endpoint=f"http://minio:{str(MINIO_PORT)}",
+    aws_s3_region="us-south",
+)