Merge remote-tracking branch 'upstream/main'

Author: CFSNM

.github/release.yml

@@ -0,0 +1,37 @@
+# Configuration for GitHub's automatically generated release notes
+# Docs: https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes
+---
+changelog:
+  # RHAIENG-581: bots and automation accounts (suppress noisy PRs)
+  exclude:
+    # TESTING: use https://github.com/opendatahub-io/notebooks/releases/new with custom branch to test this out
+    # selecting the + Create new tag in dropdown actually does not create new tag unless form is submitted
+    # then click Generate release notes to see how it comes out
+    labels:
+      # https://github.com/opendatahub-io/notebooks/pull/1961
+      - konflux-nudge
+    authors:
+      # chore(deps): update odh-workbench-jupyter-minimal-rocm-py312-ubi9 to 636a39a by @red-hat-konflux[bot] in #1961
+      - app/red-hat-konflux
+      # chore(deps): update konflux references by @red-hat-konflux[bot] in #1974
+      - red-hat-konflux[bot]
+
+      # the following are candidates for exclusion, need to determine if app/ or [bot] should be used
+
+      # [main] RHOAIENG-19036: chore(gha): fix workflow_dispatch invocation by @openshift-cherrypick-robot in #896
+      # openshift-cherrypick-robot
+
+      # RHOAIENG-28188: add `.tekton/` files for version 2025a-v1.34 by @odh-devops-app[bot] in #1365
+      # odh-devops-app[bot]
+
+      # [Digest Updater Action] Update Runtimes Images by @github-actions[bot] in #550
+      # github-actions[bot]
+
+      # RHAIENG-540: build(deps): bump `tornado` dependency from `~6.5.1` to `~6.5.2` across all relevant Pipfiles by @dependabot[bot] in #1754
+      # dependabot[bot]
+
+      # CodeRabbit Chat: Update .coderabbit.yaml to filter for main and 2024b branches only by @coderabbitai[bot] in #1491
+      # coderabbitai[bot]
+
+      # [Codeflare Action] Update notebook's pipfile to sync with Codeflare-SDK release 0.16.2 by @codeflare-machine-account in #542
+      # codeflare-machine-account

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

@@ -386,6 +386,7 @@ jobs:
 
       # https://cri-o.io/
       - name: Install cri-o
+        id: install-crio
         if: ${{ steps.have-tests.outputs.tests == 'true' }}
         run: |
           set -Eeuxo pipefail
@@ -408,9 +409,15 @@ jobs:
             sudo tee /etc/apt/sources.list.d/cri-o.list
 
           sudo apt-get update
+
           # [ERROR FileExisting-conntrack]: conntrack not found in system path
           # see man apt-patterns for the ~name=version* syntax
-          sudo apt-get install -y \
+
+          # The following packages will be DOWNGRADED:
+          #  kubectl
+          # E: Packages were downgraded and -y was used without --allow-downgrades.
+
+          sudo apt-get install -y --allow-downgrades \
             "cri-o=${CRIO_VERSION}.*" \
             "kubelet=${KUBERNETES_VERSION}.*" "kubeadm=${KUBERNETES_VERSION}.*" "kubectl=${KUBERNETES_VERSION}.*" \
             conntrack
@@ -478,7 +485,7 @@ jobs:
           sudo chown $(id -u):$(id -g) $HOME/.kube/config
 
       - name: Show kubelet debug data (on failure)
-        if: ${{ failure() && steps.have-tests.outputs.tests == 'true' }}
+        if: ${{ failure() && steps.have-tests.outputs.tests == 'true' && steps.install-crio.outcome == 'success' }}
         run: |
           set -Eeuxo pipefail
 

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

@@ -20,6 +20,10 @@ jobs:
   gen:
     name: Generate job matrix
     runs-on: ubuntu-latest
+    # for odh-io/notebooks and rhds/notebooks, allow only main, rhoai-*, release-*
+    if: ${{ (github.repository != 'opendatahub-io/notebooks' && github.repository != 'red-hat-data-services/notebooks')
+      || github.ref_name == 'main' || github.ref_name == '2024b' || github.ref_name == '2024a'
+      || startsWith(github.ref_name, 'rhoai-') || startsWith(github.ref_name, 'release-') }}
     outputs:
       matrix: ${{ steps.gen.outputs.matrix }}
       has_jobs: ${{ steps.gen.outputs.has_jobs }}

.tekton/odh-base-image-cuda-py311-c9s-pull-request.yaml

@@ -43,7 +43,7 @@ spec:
   pipelineRef:
     name: multiarch-pull-request-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-cuda-py311-c9s
+    serviceAccountName: build-pipeline-odh-base-image-cuda-py311-c9s-poc
   workspaces:
   - name: git-auth
     secret:

.tekton/odh-base-image-cuda-py311-c9s-push.yaml

@@ -34,7 +34,7 @@ spec:
   pipelineRef:
     name: singlearch-push-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-cuda-py311-c9s
+    serviceAccountName: build-pipeline-odh-base-image-cuda-py311-c9s-poc
   workspaces:
   - name: git-auth
     secret:

.tekton/odh-base-image-cuda-py312-c9s-pull-request.yaml

@@ -43,7 +43,7 @@ spec:
   pipelineRef:
     name: multiarch-pull-request-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-c9s
+    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-c9s-poc
   workspaces:
   - name: git-auth
     secret:

.tekton/odh-base-image-cuda-py312-c9s-push.yaml

@@ -1,6 +1,7 @@
 apiVersion: tekton.dev/v1
 kind: PipelineRun
 metadata:
+#TEST
   annotations:
     build.appstudio.openshift.io/repo: https://github.com/opendatahub-io/notebooks?rev={{revision}}
     build.appstudio.redhat.com/commit_sha: '{{revision}}'
@@ -34,7 +35,7 @@ spec:
   pipelineRef:
     name: singlearch-push-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-c9s
+    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-c9s-poc
   workspaces:
   - name: git-auth
     secret:

.tekton/odh-base-image-cuda-py312-ubi9-pull-request.yaml

@@ -43,7 +43,7 @@ spec:
   pipelineRef:
     name: multiarch-pull-request-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-ubi9
+    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-ubi9-poc
   workspaces:
   - name: git-auth
     secret:

.tekton/odh-base-image-cuda-py312-ubi9-push.yaml

@@ -35,7 +35,7 @@ spec:
   pipelineRef:
     name: singlearch-push-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-ubi9
+    serviceAccountName: build-pipeline-odh-base-image-cuda-py312-ubi9-poc
   workspaces:
   - name: git-auth
     secret:

.tekton/odh-base-image-rocm-py312-c9s-pull-request.yaml

@@ -43,7 +43,7 @@ spec:
   pipelineRef:
     name: multiarch-pull-request-pipeline
   taskRunTemplate:
-    serviceAccountName: build-pipeline-odh-base-image-rocm-py312-c9s
+    serviceAccountName: build-pipeline-odh-base-image-rocm-py312-c9s-poc
   workspaces:
   - name: git-auth
     secret: