Merge remote-tracking branch 'upstream/main'

dchourasia · dchourasia · commit c43026b1e3df · 2025-09-04T00:14:47.000Z
diff --git a/.tekton/odh-base-image-cuda-py311-c9s-pull-request.yaml b/.tekton/odh-base-image-cuda-py311-c9s-pull-request.yaml
@@ -36,6 +36,7 @@ spec:
   - name: build-platforms
     value:
     - linux/x86_64
+    - linux/arm64
   - name: dockerfile
     value: base-images/cuda/12.6/c9s-python-3.11/Dockerfile.cuda
   - name: path-context
diff --git a/.tekton/odh-base-image-cuda-py311-c9s-push.yaml b/.tekton/odh-base-image-cuda-py311-c9s-push.yaml
@@ -25,14 +25,18 @@ spec:
     value: quay.io/opendatahub/odh-base-image-cuda-py311-c9s:{{revision}}
   - name: dockerfile
     value: base-images/cuda/12.6/c9s-python-3.11/Dockerfile.cuda
+  - name: build-platforms
+    value:
+    - linux/x86_64
+    - linux/arm64
   - name: path-context
     value: .
   - name: additional-tags
     value:
     - '{{target_branch}}-{{revision}}'
     - v12.6
   pipelineRef:
-    name: singlearch-push-pipeline
+    name: multiarch-pull-request-pipeline
   taskRunTemplate:
     serviceAccountName: build-pipeline-odh-base-image-cuda-py311-c9s-poc
   workspaces:
diff --git a/.tekton/odh-base-image-cuda-py312-c9s-pull-request.yaml b/.tekton/odh-base-image-cuda-py312-c9s-pull-request.yaml
@@ -36,6 +36,7 @@ spec:
   - name: build-platforms
     value:
     - linux/x86_64
+    - linux/arm64
   - name: dockerfile
     value: base-images/cuda/12.6/c9s-python-3.12/Dockerfile.cuda
   - name: path-context
diff --git a/.tekton/odh-base-image-cuda-py312-c9s-push.yaml b/.tekton/odh-base-image-cuda-py312-c9s-push.yaml
@@ -26,14 +26,18 @@ spec:
     value: quay.io/opendatahub/odh-base-image-cuda-py312-c9s:{{revision}}
   - name: dockerfile
     value: base-images/cuda/12.6/c9s-python-3.12/Dockerfile.cuda
+  - name: build-platforms
+    value:
+    - linux/x86_64
+    - linux/arm64
   - name: path-context
     value: .
   - name: additional-tags
     value:
     - '{{target_branch}}-{{revision}}'
     - v12.6
   pipelineRef:
-    name: singlearch-push-pipeline
+    name: multiarch-pull-request-pipeline
   taskRunTemplate:
     serviceAccountName: build-pipeline-odh-base-image-cuda-py312-c9s-poc
   workspaces:
diff --git a/.tekton/odh-base-image-cuda-py312-ubi9-pull-request.yaml b/.tekton/odh-base-image-cuda-py312-ubi9-pull-request.yaml
@@ -36,6 +36,7 @@ spec:
   - name: build-platforms
     value:
     - linux/x86_64
+    - linux/arm64
   - name: dockerfile
     value: base-images/cuda/12.6/ubi9-python-3.12/Dockerfile.cuda
   - name: path-context
diff --git a/.tekton/odh-base-image-cuda-py312-ubi9-push.yaml b/.tekton/odh-base-image-cuda-py312-ubi9-push.yaml
@@ -26,14 +26,18 @@ spec:
     value: quay.io/opendatahub/odh-base-image-cuda-py312-ubi9:{{revision}}
   - name: dockerfile
     value: base-images/cuda/12.6/ubi9-python-3.12/Dockerfile.cuda
+  - name: build-platforms
+    value:
+    - linux/x86_64
+    - linux/arm64
   - name: path-context
     value: .
   - name: additional-tags
     value:
     - '{{target_branch}}-{{revision}}'
     - v12.6
   pipelineRef:
-    name: singlearch-push-pipeline
+    name: multiarch-pull-request-pipeline
   taskRunTemplate:
     serviceAccountName: build-pipeline-odh-base-image-cuda-py312-ubi9-poc
   workspaces:
diff --git a/jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu b/jupyter/datascience/ubi9-python-3.12/Dockerfile.cpu
@@ -125,7 +125,8 @@ RUN echo "Installing softwares and packages" && \
     # Replace Notebook's launcher, "(ipykernel)" with Python's version 3.x.y \
     sed -i -e "s/Python.*/$(python --version | cut -d '.' -f-2)\",/" /opt/app-root/share/jupyter/kernels/python3/kernel.json && \
     # copy jupyter configuration
-    cp /opt/app-root/bin/utils/jupyter_server_config.py /opt/app-root/etc/jupyter && \
+    install -D -m 0644 /opt/app-root/bin/utils/jupyter_server_config.py \
+      /opt/app-root/etc/jupyter/jupyter_server_config.py && \
     # Disable announcement plugin of jupyterlab \
     jupyter labextension disable "@jupyterlab/apputils-extension:announcements" && \
     # Apply JupyterLab addons \
diff --git a/manifests/overlays/additional/jupyter-datascience-cpu-py312-ubi9-imagestream.yaml b/manifests/overlays/additional/jupyter-datascience-cpu-py312-ubi9-imagestream.yaml
@@ -35,7 +35,7 @@ spec:
             {"name": "Odh-Elyra", "version": "4.2"},
             {"name": "PyMongo", "version": "4.11"},
             {"name": "Pyodbc", "version": "5.2"},
-            {"name": "Codeflare-SDK", "version": "0.29"},
+            {"name": "Codeflare-SDK", "version": "0.30"},
             {"name": "Sklearn-onnx", "version": "1.18"},
             {"name": "Psycopg", "version": "3.2"},
             {"name": "MySQL Connector/Python", "version": "9.3"},
diff --git a/manifests/overlays/additional/jupyter-pytorch-cuda-py312-ubi9-imagestream.yaml b/manifests/overlays/additional/jupyter-pytorch-cuda-py312-ubi9-imagestream.yaml
@@ -40,7 +40,7 @@ spec:
             {"name": "Odh-Elyra", "version": "4.2"},
             {"name": "PyMongo", "version": "4.11"},
             {"name": "Pyodbc", "version": "5.2"},
-            {"name": "Codeflare-SDK", "version": "0.29"},
+            {"name": "Codeflare-SDK", "version": "0.30"},
             {"name": "Sklearn-onnx", "version": "1.18"},
             {"name": "Psycopg", "version": "3.2"},
             {"name": "MySQL Connector/Python", "version": "9.3"},
diff --git a/manifests/overlays/additional/jupyter-pytorch-rocm-py312-ubi9-imagestream.yaml b/manifests/overlays/additional/jupyter-pytorch-rocm-py312-ubi9-imagestream.yaml
@@ -37,7 +37,7 @@ spec:
             {"name": "Odh-Elyra", "version": "4.2"},
             {"name": "PyMongo", "version": "4.11"},
             {"name": "Pyodbc", "version": "5.2"},
-            {"name": "Codeflare-SDK", "version": "0.29"},
+            {"name": "Codeflare-SDK", "version": "0.30"},
             {"name": "Sklearn-onnx", "version": "1.18"},
             {"name": "Psycopg", "version": "3.2"},
             {"name": "MySQL Connector/Python", "version": "9.3"},
diff --git a/manifests/overlays/additional/jupyter-tensorflow-cuda-py312-ubi9-imagestream.yaml b/manifests/overlays/additional/jupyter-tensorflow-cuda-py312-ubi9-imagestream.yaml
@@ -41,7 +41,7 @@ spec:
             {"name": "Odh-Elyra", "version": "4.2"},
             {"name": "PyMongo", "version": "4.11"},
             {"name": "Pyodbc", "version": "5.2"},
-            {"name": "Codeflare-SDK", "version": "0.29"},
+            {"name": "Codeflare-SDK", "version": "0.30"},
             {"name": "Sklearn-onnx", "version": "1.18"},
             {"name": "Psycopg", "version": "3.2"},
             {"name": "MySQL Connector/Python", "version": "9.3"}
diff --git a/tests/test_main.py b/tests/test_main.py
@@ -4,13 +4,15 @@
 import logging
 import os
 import pathlib
+import re
 import shutil
 import subprocess
 import tomllib
 from typing import TYPE_CHECKING
 
 import packaging.requirements
 import packaging.utils
+import packaging.version
 import pytest
 import yaml
 
@@ -175,11 +177,25 @@ def test_image_pyprojects(subtests: pytest_subtests.plugin.SubTests):
                         else:
                             normalized_name = name
 
+                        # assert on name
+
                         resolved = pylock_packages.get(normalized_name, None)
                         if resolved is None:
                             with subtests.test(name):
                                 pytest.fail(f"Dependency {name} ({normalized_name=}) is not in pylock.toml ({file=})")
 
+                        # assert on version
+
+                        manifest_version = d.get("version")
+                        locked_version = resolved.get("version")
+
+                        split_manifest_version = re.fullmatch(r"^v?(\d+)\.(\d+)", manifest_version)
+                        assert split_manifest_version is not None, f"{name}: malformed {manifest_version=}"
+                        parsed_locked_version = packaging.version.Version(locked_version)
+                        assert (parsed_locked_version.major, parsed_locked_version.minor) == tuple(
+                            int(v) for v in split_manifest_version.groups()
+                        ), f"{name}: manifest declares {manifest_version}, but pylock.toml pins {locked_version}"
+
 
 def test_files_that_should_be_same_are_same(subtests: pytest_subtests.plugin.SubTests):
     file_groups = {
