Merge remote-tracking branch 'upstream/main' into rhoai-2.22

Author: CFSNM

.github/workflows/build-notebooks-TEMPLATE.yaml

@@ -186,6 +186,10 @@ jobs:
           # remote (CONTAINER_HOST) podman does not do reset (and refuses --force option)
           sudo /home/linuxbrew/.linuxbrew/opt/podman/bin/podman system reset --force
 
+          # https://github.com/containers/podman/pull/25504
+          # podman 5.5.0: The podman system reset command no longer removes the user's podman.sock API socket
+          sudo rm -rf /var/run/podman
+
           # https://github.com/containers/podman/blob/main/docs/tutorials/socket_activation.md
           # since `brew services start podman` is buggy, let's do our own brew-compatible service
           # Regarding directory paths, see https://unix.stackexchange.com/questions/224992/where-do-i-put-my-systemd-unit-file
@@ -204,7 +208,12 @@ jobs:
 
       - name: Show error logs (on failure)
         if: ${{ failure() }}
-        run: journalctl -xe
+        run: |
+          set -Eeuxo pipefail
+
+          journalctl -xe
+          ls -AlF /var/run/podman/podman.sock || echo "Socket /var/run/podman/podman.sock not found"
+          sudo ss -xlpn | grep 'podman.sock' || echo "No active listener found for podman.sock via ss"
 
       - name: Calculate image name and tag
         id: calculated_vars

ci/cached-builds/podman.service

@@ -1,3 +1,4 @@
+# https://github.com/containers/podman/blob/main/contrib/systemd/system/podman.service.in
 # https://docs.podman.io/en/latest/markdown/podman-system-service.1.html
 # cat /usr/lib/systemd/system/podman.socket
 

ci/cached-builds/podman.socket

@@ -1,3 +1,4 @@
+# https://github.com/containers/podman/blob/main/contrib/systemd/system/podman.socket
 # cat /usr/lib/systemd/system/podman.socket
 
 [Unit]

docs/developer-guide.md

@@ -144,9 +144,9 @@ This section provides an overview of the automation functionalities.
 
 This GitHub action is configured to be triggered on a weekly basis, specifically every Monday at 22:00 PM UTC. Its main objective is to automatically update the Pipfile.lock files by fetching the most recent minor versions available. Additionally, it also updates the hashes for the downloaded files of Python dependencies, including any sub-dependencies. Once the updated files are pushed, the CI pipeline is triggered to generate new updated images based on these changes.
 
-### **Sync the downstream release branch with the upstream** [[Link]](https://github.com/red-hat-data-services/notebooks/blob/main/.github/workflows/sync-release-branch-2023a.yml)
+### **Sync the downstream release branch with the upstream** [[Link]](https://github.com/red-hat-data-services/rhods-devops-infra/blob/main/.github/workflows/upstream-auto-merge.yaml)
 
-This GitHub action is configured to be triggered on a weekly basis, specifically every Tuesday at 08:00 AM UTC. Its main objective is to automatically update the downstream release branch with the upstream branch. 
+This GitHub action is configured to be triggered on a daily basis and synchronizes the selected projects from their upstream repositories to their downstream counterparts.
 
 ### **Digest Updater workflow on the manifests** [[Link]](https://github.com/opendatahub-io/odh-manifests/blob/master/.github/workflows/notebooks-digest-updater-upstream.yaml)
  

manifests/base/cuda-rstudio-buildconfig.yaml

@@ -42,7 +42,7 @@ spec:
     type: Git
     git:
       uri: "https://github.com/red-hat-data-services/notebooks"
-      ref: rhoai-2.20
+      ref: rhoai-2.21
   strategy:
     type: Docker
     dockerStrategy:

manifests/base/rstudio-buildconfig.yaml

@@ -39,7 +39,7 @@ spec:
     type: Git
     git:
       uri: "https://github.com/red-hat-data-services/notebooks"
-      ref: rhoai-2.20
+      ref: rhoai-2.21
   strategy:
     type: Docker
     dockerStrategy: