Merge branch 'main' into support_build_push

Author: dbasunag

.github/workflows/add-remove-labels.yml

@@ -42,7 +42,7 @@ jobs:
 
       - name: Run add remove labels
         env:
-          GITHUB_TOKEN: ${{ secrets.OPENDATAHUB_TESTS_BOT_PAT }}
+          GITHUB_TOKEN: ${{ secrets.RHODS_CI_BOT_PAT }}
           GITHUB_PR_NUMBER: "${{ github.event.pull_request.number || github.event.issue.number }}"
           GITHUB_EVENT_ACTION: ${{ github.event.action }}
           GITHUB_EVENT_REVIEW_STATE: ${{ github.event.review.state }}

.github/workflows/cherry-pick-comment.yml

@@ -17,9 +17,9 @@ jobs:
       - name: Checkout the latest code
         uses: actions/checkout@v4
         with:
-          token: ${{ secrets.OPENDATAHUB_TESTS_BOT_PAT }}
+          token: ${{ secrets.RHODS_CI_BOT_PAT }}
           fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
       - name: Automatic Cherry Pick
         uses:  dbasunag/cherry-pick-pr@master
         env:
-          GITHUB_TOKEN: ${{ secrets.OPENDATAHUB_TESTS_BOT_PAT }}
+          GITHUB_TOKEN: ${{ secrets.RHODS_CI_BOT_PAT }}

.github/workflows/on-review-add-label.yml

@@ -83,6 +83,6 @@ jobs:
         uses: astral-sh/setup-uv@v6
       - name: 'Run add-remove-labels action'
         env:
-          GITHUB_TOKEN: ${{ secrets.OPENDATAHUB_TESTS_BOT_PAT }}
+          GITHUB_TOKEN: ${{ secrets.RHODS_CI_BOT_PAT }}
           GITHUB_EVENT_NAME: ${{ needs.download_context_artifact.outputs.event_name }}
         run: uv run python .github/workflows/scripts/pr_workflow.py

.pre-commit-config.yaml

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

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.38",
+    "openshift-python-wrapper>=11.0.50",
     "semver>=3.0.4",
     "pytest-order>=1.3.0",
     "marshmallow==3.26.1,<4", # this version is needed for pytest-jira

tests/workbenches/conftest.py

@@ -83,6 +83,7 @@ def default_notebook(
 
     # Set the correct username
     username = get_username(dyn_client=admin_client)
+    assert username, "Failed to determine username from the cluster"
 
     # Set the image path based on internal image registry status
     minimal_image_path = (

tests/workbenches/utils.py

@@ -1,11 +1,23 @@
-from kubernetes.dynamic import DynamicClient, Resource, ResourceInstance
+from kubernetes.dynamic import DynamicClient
+from ocp_resources.self_subject_review import SelfSubjectReview
+from ocp_resources.user import User
+from simple_logger.logger import get_logger
 
+LOGGER = get_logger(name=__name__)
 
-def get_username(dyn_client: DynamicClient) -> str:
+
+def get_username(dyn_client: DynamicClient) -> str | None:
     """Gets the username for the client (see kubectl -v8 auth whoami)"""
-    self_subject_review_resource: Resource = dyn_client.resources.get(
-        api_version="authentication.k8s.io/v1", kind="SelfSubjectReview"
-    )
-    self_subject_review: ResourceInstance = dyn_client.create(self_subject_review_resource)
-    username: str = self_subject_review.status.userInfo.username
+    username: str | None
+    try:
+        self_subject_review = SelfSubjectReview(client=dyn_client, name="selfSubjectReview").create()
+        assert self_subject_review
+        username = self_subject_review.status.userInfo.username
+    except NotImplementedError:
+        LOGGER.info(
+            "SelfSubjectReview not found. Falling back to user.openshift.io/v1/users/~ for OpenShift versions <=4.14"
+        )
+        user = User(client=dyn_client, name="~").instance
+        username = user.get("metadata", {}).get("name", None)
+
     return username

utilities/infra.py

@@ -851,16 +851,33 @@ def wait_for_isvc_pods(client: DynamicClient, isvc: InferenceService, runtime_na
     return get_pods_by_isvc_label(client=client, isvc=isvc, runtime_name=runtime_name)
 
 
-def verify_dsci_status_ready(dsci_resource: DSCInitialization) -> None:
-    LOGGER.info(f"Verify DSCI {dsci_resource.name} are {dsci_resource.Status.READY}.")
-    if dsci_resource.status != dsci_resource.Status.READY:
-        raise ResourceNotReadyError(f"DSCI {dsci_resource.name} is not ready.\nStatus: {dsci_resource.instance.status}")
+@retry(
+    wait_timeout=120,
+    sleep=5,
+    exceptions_dict={ResourceNotReadyError: []},
+)
+def wait_for_dsci_status_ready(dsci_resource: DSCInitialization) -> bool:
+    LOGGER.info(f"Wait for DSCI {dsci_resource.name} to be in {dsci_resource.Status.READY} status.")
+    if dsci_resource.status == dsci_resource.Status.READY:
+        return True
+
+    raise ResourceNotReadyError(
+        f"DSCI {dsci_resource.name} is not ready.\nCurrent status: {dsci_resource.instance.status}"
+    )
 
 
-def verify_dsc_status_ready(dsc_resource: DataScienceCluster) -> None:
-    LOGGER.info(f"Verify DSC {dsc_resource.name} are {dsc_resource.Status.READY}.")
-    if dsc_resource.status != dsc_resource.Status.READY:
-        raise ResourceNotReadyError(f"DSC {dsc_resource.name} is not ready.\nStatus: {dsc_resource.instance.status}")
+@retry(
+    wait_timeout=120,
+    sleep=5,
+    exceptions_dict={ResourceNotReadyError: []},
+)
+def wait_for_dsc_status_ready(dsc_resource: DataScienceCluster) -> bool:
+    LOGGER.info(f"Wait for DSC {dsc_resource.name} are {dsc_resource.Status.READY}.")
+    if dsc_resource.status == dsc_resource.Status.READY:
+        return True
+    raise ResourceNotReadyError(
+        f"DSC {dsc_resource.name} is not ready.\nCurrent status: {dsc_resource.instance.status}"
+    )
 
 
 def verify_cluster_sanity(
@@ -898,8 +915,8 @@ def verify_cluster_sanity(
             LOGGER.warning(f"Skipping RHOAI resource checks, got {skip_rhoai_check}")
 
         else:
-            verify_dsci_status_ready(dsci_resource=dsci_resource)
-            verify_dsc_status_ready(dsc_resource=dsc_resource)
+            wait_for_dsci_status_ready(dsci_resource=dsci_resource)
+            wait_for_dsc_status_ready(dsc_resource=dsc_resource)
 
     except (ResourceNotReadyError, NodeUnschedulableError, NodeNotReadyError) as ex:
         error_msg = f"Cluster sanity check failed: {str(ex)}"