Skip to content

Conversation

@ysok
Copy link

@ysok ysok commented Oct 28, 2025

RHAIENG-1603: Introduce new build-args for konflux build

Description

To minimize code conflicts between Dockerfile.* and Dockerfile.konflux., and to avoid having specific changes for Konflux, we can customize those changes into build-args. These build-args can be clearly separated between upstream and downstream build arguments. By doing so, Dockerfile.konflux. will become more similar to the original upstream Dockerfile., while still having their own specific parameters defined separately in their own build-args/.conf.

How Has This Been Tested?

gmake test => ✅ All Dockerfiles are in sync.

Self checklist (all need to be checked):

  • Ensure that you have run make test (gmake on macOS) before asking for review
  • Changes to everything except Dockerfile.konflux files should be done in odh/notebooks and automatically synced to rhds/notebooks. For Konflux-specific changes, modify Dockerfile.konflux files directly in rhds/notebooks as these require special attention in the downstream repository and flow to the upcoming RHOAI release.

Merge criteria:

  • The commits are squashed in a cohesive manner and have meaningful messages.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

@openshift-ci
Copy link

openshift-ci bot commented Oct 28, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link
Member

@atheo89 atheo89 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hey Vath, these changes look good. However, these files are synced from konflux-central this is the notebooks builds folder.
Once we decide on the RHOAI version to apply them to, we can update the files directly there (in the RHOAI release branch and main), and then sync them back here.

@ysok
Copy link
Author

ysok commented Oct 30, 2025

@atheo89 does that mean I have to submit another PR to konflux-central for .tekton/* ? And does it get synced manually/automatically?

@atheo89
Copy link
Member

atheo89 commented Oct 30, 2025

@ysok exactly. Looks after the push commit the changes sync automatically on the components repo. For more details check here: https://github.com/red-hat-data-services/notebooks/blob/rhoai-3.0/.tekton/README.md

@ysok ysok force-pushed the RHAIENG-1603-param-conf branch from 63192e2 to 4584945 Compare November 4, 2025 22:16
@ysok ysok force-pushed the RHAIENG-1603-param-conf branch from 4584945 to 4c1896b Compare November 18, 2025 20:21
@ysok ysok marked this pull request as ready for review November 18, 2025 20:23
@openshift-ci openshift-ci bot requested review from atheo89 and jiridanek November 18, 2025 20:23
@ysok ysok requested a review from daniellutz November 18, 2025 20:24
@ysok
Copy link
Author

ysok commented Nov 18, 2025

This PR is good to merge, the konflux.*.conf files are here in repository, but won't get used until I made changes to .tekton files in konflux-central repository.

I'll create another separate PR for konflux-central, and it should sync .tekton files back to this repos, so it can make used of this konflux.*.conf

@openshift-ci
Copy link

openshift-ci bot commented Nov 18, 2025

@ysok: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/images 4c1896b link true /test images

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@openshift-ci
Copy link

openshift-ci bot commented Nov 19, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jiridanek

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

The pull request process is described here

Needs approval from an approver in each of these files:

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

@atheo89
Copy link
Member

atheo89 commented Nov 19, 2025

/lgtm

Thanks Vath! Do you have perms to merge the PR?

@ysok ysok merged commit bda9b25 into red-hat-data-services:main Nov 19, 2025
25 of 47 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants