Sync downstream `main` from upstream #1521

atheo89 · 2025-09-05T08:18:08Z

Sync downstream main from upstream

Add multiarch-push-pipeline config

…pdate its push pipelines

…pilines

…rgs-file option and run it to update them all

… validation between imagestreams (opendatahub-io#2260)

Add missing matrix for multiplatform builds

Replace yum with dnf to have better consistency among the Dockerfiles

Fix build matrix

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>

…alignment test and handle allowed specifier divergences (opendatahub-io#2276) * Add test_image_pyprojects_version_alignment to compare dependency specifiers across all pyproject.toml files * Import packaging.specifiers and store actual SpecifierSet objects instead of string reprs * Introduce ignored_exceptions for known, acceptable specifier differences (e.g., torch variants, numpy caps) * Compare specifiers using SpecifierSet equality and wrap checks in subtests for clearer reporting * Minor cleanup: remove unused pyprojects variable

…ds-compatible manner (opendatahub-io#2277)

… outdated jupyterlab and jupyterlab-git packages (opendatahub-io#2278) ``` ============================================================================================================ FAILURES ============================================================================================================= _______________________________________________________________ test_image_pyprojects_version_alignment [checking versions of skl2onnx across all pyproject.tomls] ________________________________________________________________ tests/test_main.py:295: in test_image_pyprojects_version_alignment pytest.fail(f"{name} has multiple specifiers: {pprint.pformat(data)}") E Failed: skl2onnx has multiple specifiers: [<SpecifierSet('~=1.17.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.17.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>, E <SpecifierSet('~=1.18.0')>] -------------------------------------------------------------------------------------------------------- Captured log call -------------------------------------------------------------------------------------------------------- _______________________________________________________________ test_image_pyprojects_version_alignment [checking versions of odh-elyra across all pyproject.tomls] _______________________________________________________________ tests/test_main.py:295: in test_image_pyprojects_version_alignment pytest.fail(f"{name} has multiple specifiers: {pprint.pformat(data)}") E Failed: odh-elyra has multiple specifiers: [<SpecifierSet('==4.2.3')>, E <SpecifierSet('==4.2.3')>, E <SpecifierSet('==4.2.3')>, E <SpecifierSet('==4.2.1')>, E <SpecifierSet('==4.2.3')>, E <SpecifierSet('==4.2.3')>, E <SpecifierSet('==4.2.3')>] -------------------------------------------------------------------------------------------------------- Captured log call -------------------------------------------------------------------------------------------------------- ______________________________________________________________ test_image_pyprojects_version_alignment [checking versions of jupyterlab across all pyproject.tomls] _______________________________________________________________ tests/test_main.py:295: in test_image_pyprojects_version_alignment pytest.fail(f"{name} has multiple specifiers: {pprint.pformat(data)}") E Failed: jupyterlab has multiple specifiers: [<SpecifierSet('==4.4.4')>, E <SpecifierSet('==4.4.4')>, E <SpecifierSet('==4.4.4')>, E <SpecifierSet('==4.4.4')>, E <SpecifierSet('==4.2.7')>, E <SpecifierSet('==4.4.4')>, E <SpecifierSet('==4.4.4')>, E <SpecifierSet('==4.4.4')>] -------------------------------------------------------------------------------------------------------- Captured log call -------------------------------------------------------------------------------------------------------- ____________________________________________________________ test_image_pyprojects_version_alignment [checking versions of jupyter-server across all pyproject.tomls] _____________________________________________________________ tests/test_main.py:295: in test_image_pyprojects_version_alignment pytest.fail(f"{name} has multiple specifiers: {pprint.pformat(data)}") E Failed: jupyter-server has multiple specifiers: [<SpecifierSet('~=2.16.0')>, E <SpecifierSet('~=2.16.0')>, E <SpecifierSet('~=2.16.0')>, E <SpecifierSet('~=2.16.0')>, E <SpecifierSet('~=2.15.0')>, E <SpecifierSet('~=2.16.0')>, E <SpecifierSet('~=2.16.0')>, E <SpecifierSet('~=2.16.0')>] -------------------------------------------------------------------------------------------------------- Captured log call -------------------------------------------------------------------------------------------------------- ____________________________________________________________ test_image_pyprojects_version_alignment [checking versions of jupyterlab-git across all pyproject.tomls] _____________________________________________________________ tests/test_main.py:295: in test_image_pyprojects_version_alignment pytest.fail(f"{name} has multiple specifiers: {pprint.pformat(data)}") E Failed: jupyterlab-git has multiple specifiers: [<SpecifierSet('~=0.51.1')>, E <SpecifierSet('~=0.51.1')>, E <SpecifierSet('~=0.51.1')>, E <SpecifierSet('~=0.51.1')>, E <SpecifierSet('~=0.50.1')>, E <SpecifierSet('~=0.51.1')>, E <SpecifierSet('~=0.51.1')>, E <SpecifierSet('~=0.51.1')>] -------------------------------------------------------------------------------------------------------- Captured log call -------------------------------------------------------------------------------------------------------- ________________________________________________________ test_image_pyprojects_version_alignment [checking versions of jupyter-resource-usage across all pyproject.tomls] _________________________________________________________ tests/test_main.py:295: in test_image_pyprojects_version_alignment pytest.fail(f"{name} has multiple specifiers: {pprint.pformat(data)}") E Failed: jupyter-resource-usage has multiple specifiers: [<SpecifierSet('~=1.1.1')>, E <SpecifierSet('~=1.1.1')>, E <SpecifierSet('~=1.1.1')>, E <SpecifierSet('~=1.1.0')>, E <SpecifierSet('~=1.1.1')>, E <SpecifierSet('~=1.1.1')>, E <SpecifierSet('~=1.1.1')>] -------------------------------------------------------------------------------------------------------- Captured log call -------------------------------------------------------------------------------------------------------- ===================================================================================================== short test summary info ===================================================================================================== [checking versions of skl2onnx across all pyproject.tomls] SUBFAIL tests/test_main.py::test_image_pyprojects_version_alignment - Failed: skl2onnx has multiple specifiers: [<SpecifierSet('~=1.17.0')>, [checking versions of odh-elyra across all pyproject.tomls] SUBFAIL tests/test_main.py::test_image_pyprojects_version_alignment - Failed: odh-elyra has multiple specifiers: [<SpecifierSet('==4.2.3')>, [checking versions of jupyterlab across all pyproject.tomls] SUBFAIL tests/test_main.py::test_image_pyprojects_version_alignment - Failed: jupyterlab has multiple specifiers: [<SpecifierSet('==4.4.4')>, [checking versions of jupyter-server across all pyproject.tomls] SUBFAIL tests/test_main.py::test_image_pyprojects_version_alignment - Failed: jupyter-server has multiple specifiers: [<SpecifierSet('~=2.16.0')>, [checking versions of jupyterlab-git across all pyproject.tomls] SUBFAIL tests/test_main.py::test_image_pyprojects_version_alignment - Failed: jupyterlab-git has multiple specifiers: [<SpecifierSet('~=0.51.1')>, [checking versions of jupyter-resource-usage across all pyproject.tomls] SUBFAIL tests/test_main.py::test_image_pyprojects_version_alignment - Failed: jupyter-resource-usage has multiple specifiers: [<SpecifierSet('~=1.1.1')>, ================================================================================== 6 failed, 32 passed, 48 skipped, 114 subtests passed in 2.88s ================================================================================== gmake: *** [Makefile:518: test] Error 1 ```

Refactor Dockerfiles to Use Config Files via ARG

…i9 to b0385e9 Image created from 'https://github.com/opendatahub-io/notebooks?rev=99698b723aec25ae787886c001b1ecef888d9fc3' Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>

…mponent-updates/component-update-odh-workbench-codeserver-datascience-cpu-py312-ubi9 chore(deps): update odh-workbench-codeserver-datascience-cpu-py312-ubi9 to b0385e9

…to 40b63ff Image created from 'https://github.com/opendatahub-io/notebooks?rev=99698b723aec25ae787886c001b1ecef888d9fc3' Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>

…o 9b91566 Image created from 'https://github.com/opendatahub-io/notebooks?rev=99698b723aec25ae787886c001b1ecef888d9fc3' Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>

…mponent-updates/component-update-odh-pipeline-runtime-datascience-cpu-py312-ubi9 chore(deps): update odh-pipeline-runtime-datascience-cpu-py312-ubi9 to 9b91566

…mponent-updates/component-update-odh-workbench-jupyter-datascience-cpu-py312-ubi9 chore(deps): update odh-workbench-jupyter-datascience-cpu-py312-ubi9 to 40b63ff

…to sync-x2

openshift-ci · 2025-09-05T08:18:16Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign jstourac for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

github-actions

📋 Review Summary

This PR syncs the downstream main branch from upstream, bringing in a lot of changes. The overall direction of the changes is good, with significant improvements in the CI/CD pipelines and Dockerfile structure.

🔍 General Feedback

The move to multiarch-push-pipeline and the introduction of build-args configuration files are excellent improvements that will make the build process more robust and maintainable.
The refactoring of Dockerfiles to use base images and dnf is a good modernization step.
The updates to the test suite to ensure dependency alignment are a great addition and will help to improve the stability of the project.

Overall, this is a solid sync commit with many positive changes.

github-actions · 2025-09-05T08:19:35Z

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

    value:
    - '{{target_branch}}-{{revision}}'
    - v12.6
  pipelineRef:


🟢 The change from multiarch-pull-request-pipeline to multiarch-push-pipeline is a good improvement, as it aligns the push pipeline with the new multi-arch build strategy.

github-actions · 2025-09-05T08:19:44Z

Makefile

+	fi))
+
+	$(info # Building $(IMAGE_NAME) using $(DOCKERFILE_NAME) with $(CONF_FILE) and $(BUILD_ARGS)...)



🟢 The addition of logic to handle build-args/*.conf files is a great enhancement. It makes the build process more flexible and easier to configure without modifying the Makefile directly.

github-actions · 2025-09-05T08:19:51Z

base-images/cuda/12.6/c9s-python-3.11/Dockerfile.cuda


 # For libraries in the cuda-compat-* package: https://docs.nvidia.com/cuda/eula/index.html#attachment-a
-RUN yum upgrade -y && yum install -y \
+RUN dnf upgrade -y && dnf install -y \


🟢 Using dnf instead of yum is the correct approach for RHEL 9 based images. This ensures compatibility and leverages the latest package management features.

github-actions · 2025-09-05T08:19:59Z

codeserver/ubi9-python-3.12/Dockerfile.cpu

+#########################
+# configuration args    #
+#########################
+ARG BASE_IMAGE


🟢 The introduction of ARG BASE_IMAGE is a good practice. It makes the Dockerfile more modular and reusable, allowing the base image to be specified at build time. This is a great improvement for maintainability.

github-actions · 2025-09-05T08:20:11Z

tests/test_main.py

                            "Torch",
                            "Transformers",
                            "TrustyAI",
                        }


🟢 The new test test_image_manifests_version_alignment is a valuable addition. It will help to ensure consistency of dependencies across all images and prevent version conflicts. This is a great improvement for the project's stability.

github-actions · 2025-09-05T08:20:46Z

There is a problem with the Gemini CLI PR review. Please check the action logs for details.

atheo89 and others added 30 commits September 4, 2025 09:31

Add multiarch-push-pipeline config

aae0a60

Merge pull request opendatahub-io#2270 from atheo89/multiplatform

076ef9b

Add multiarch-push-pipeline config

Update minimal cpu, cuda and rocm flavors to use args

52cee92

Update runtime minimal Dockefile to use ARG

80a5cbb

Update pipelines to consume build-args file

d73e65c

Update Datascience and its runtime to use arg base_image as well as u…

03f1dd7

…pdate its push pipelines

Update pytorch cuda and its runtime as well as its tekton pipelines

a801c39

Update pytorch_llmcompressor and its runtime as well as the tekton pi…

6027bcf

…pilines

Update pytorch rocm and its runtime as well as the tekton pipelines

dbb5ee5

Update tensorflow-rocm and its runtime as well as the tekton pipilines

23b1046

Update tensorflow and its runtime as well as the tekton pipelines

f224482

Update trusty and its tekton pipeline

e06b68c

Update codeserver as well as its pipeline

2270a47

Update RStudio c9s flavos and its pipelines

f71bc18

Update the generate_pull_request_pipelineruns.py to track the build-a…

d31d423

…rgs-file option and run it to update them all

clean up from unused commands

a742c56

configuration ARGs should be on the top level on the Dockerfile

8134f76

Update base images with the real odh base images

d0fccc2

Fix path on runtime minimal conf file

904bf23

RHAIENG-308, opendatahub-io#2242: tests(make): enforce version parity…

a7b8f66

… validation between imagestreams (opendatahub-io#2260)

Recomented fixes noted by code rabit

798bfe2

Replace yum with dnf to have better consistency among the Dockerfiles

00d9f61

Add missing matrix for multiplatform builds

70b47db

Merge pull request opendatahub-io#2273 from atheo89/multiplatform

db1dca1

Add missing matrix for multiplatform builds

Update odh-base-image-cuda-py312-c9s-push.yaml

410b27d

Merge pull request opendatahub-io#2272 from atheo89/dnf-update

20c2636

Replace yum with dnf to have better consistency among the Dockerfiles

Update odh-base-image-cuda-py312-ubi9-push.yaml

b82d67e

Fix build matrix

894c00c

Merge pull request opendatahub-io#2274 from atheo89/multiplatform

1196d34

Fix build matrix

Update odh-base-image-cuda-py312-ubi9-push.yaml

1bfafea

atheo89 and others added 22 commits September 4, 2025 16:34

Update multiarch-push-pipeline.yaml

3a6d985

Update odh-base-image-cuda-py312-ubi9-push.yaml

c53b52b

Update odh-base-image-cuda-py311-c9s-push.yaml

f410e35

Update odh-base-image-cuda-py312-c9s-push.yaml

341d899

chore(deps): update konflux references (opendatahub-io#2108)

61d33e7

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com> Co-authored-by: red-hat-konflux[bot] <126015336+red-hat-konflux[bot]@users.noreply.github.com>

Update multiarch-push-pipeline.yaml

c553a86

Update odh-base-image-cuda-py312-c9s-push.yaml

ae521a6

Update multiarch-push-pipeline.yaml

f8b07f5

Update odh-base-image-cuda-py311-c9s-push.yaml

84e3874

Update odh-base-image-cuda-py312-c9s-push.yaml

00dff74

Update odh-base-image-cuda-py312-ubi9-push.yaml

1bd738f

RHAIENG-308, opendatahub-io#2242: tests(make): handle rstudio in a rh…

fc46ec1

…ds-compatible manner (opendatahub-io#2277)

Merge pull request opendatahub-io#2271 from atheo89/RHAIENG-779

99698b7

Refactor Dockerfiles to Use Config Files via ARG

Merge pull request opendatahub-io#2280 from opendatahub-io/konflux/co…

2ad0673

…mponent-updates/component-update-odh-workbench-codeserver-datascience-cpu-py312-ubi9 chore(deps): update odh-workbench-codeserver-datascience-cpu-py312-ubi9 to b0385e9

chore(deps): update odh-workbench-jupyter-datascience-cpu-py312-ubi9 …

1783197

…to 40b63ff Image created from 'https://github.com/opendatahub-io/notebooks?rev=99698b723aec25ae787886c001b1ecef888d9fc3' Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>

chore(deps): update odh-pipeline-runtime-datascience-cpu-py312-ubi9 t…

1ff5c91

…o 9b91566 Image created from 'https://github.com/opendatahub-io/notebooks?rev=99698b723aec25ae787886c001b1ecef888d9fc3' Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>

Merge pull request opendatahub-io#2283 from opendatahub-io/konflux/co…

28d1db5

…mponent-updates/component-update-odh-pipeline-runtime-datascience-cpu-py312-ubi9 chore(deps): update odh-pipeline-runtime-datascience-cpu-py312-ubi9 to 9b91566

Merge pull request opendatahub-io#2282 from opendatahub-io/konflux/co…

3f21665

…mponent-updates/component-update-odh-workbench-jupyter-datascience-cpu-py312-ubi9 chore(deps): update odh-workbench-jupyter-datascience-cpu-py312-ubi9 to 40b63ff

Merge branch 'main' of https://github.com/opendatahub-io/notebooks in…

41b4b85

…to sync-x2

openshift-ci bot requested review from dibryant and jiridanek September 5, 2025 08:18

github-actions bot added the review-requested label Sep 5, 2025

atheo89 merged commit c643233 into red-hat-data-services:main Sep 5, 2025
29 of 42 checks passed

github-actions bot reviewed Sep 5, 2025

View reviewed changes

atheo89 deleted the sync-x2 branch October 13, 2025 12:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Sync downstream `main` from upstream #1521

Sync downstream `main` from upstream #1521

Uh oh!

atheo89 commented Sep 5, 2025

Uh oh!

openshift-ci bot commented Sep 5, 2025

Uh oh!

Uh oh!

github-actions bot left a comment

Uh oh!

github-actions bot Sep 5, 2025

Uh oh!

github-actions bot Sep 5, 2025

Uh oh!

github-actions bot Sep 5, 2025

Uh oh!

github-actions bot Sep 5, 2025

Uh oh!

github-actions bot Sep 5, 2025

Uh oh!

github-actions bot commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

		fi))

		$(info # Building $(IMAGE_NAME) using $(DOCKERFILE_NAME) with $(CONF_FILE) and $(BUILD_ARGS)...)

Sync downstream main from upstream #1521

Sync downstream main from upstream #1521

Uh oh!

Conversation

atheo89 commented Sep 5, 2025

Uh oh!

openshift-ci bot commented Sep 5, 2025

Uh oh!

Uh oh!

github-actions bot left a comment

Choose a reason for hiding this comment

📋 Review Summary

🔍 General Feedback

Uh oh!

github-actions bot Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot Sep 5, 2025

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Sep 5, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Sync downstream `main` from upstream #1521

Sync downstream `main` from upstream #1521