Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce custom sync-downstream GHA, this can handle known conflicts #499

Merged

Conversation

atheo89
Copy link
Member

@atheo89 atheo89 commented Jan 27, 2025

Related to: https://issues.redhat.com/browse/RHOAIENG-15392

Description

This GitHub Action aims to sync the downstream branch with the corresponding upstream, resolve known conflicts, and generates a pull request.

How has been tested

Created a simulated org for dev and test purposes:
Some gh runs: https://github.com/Org-Test-Template/notebooks/actions/workflows/sync-downstream.yaml
Example PRs: https://github.com/Org-Test-Template/notebooks/pulls

Copy link

openshift-ci bot commented Jan 27, 2025

@jiridanek: Overrode contexts on behalf of jiridanek: ci/prow/images

In response to this:

/override ci/prow/images
not appliable for the pr

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.

@jiridanek
Copy link
Member

/lgtm
this looks like the tried and true strategy from odh-io/kubeflow; it's just that we won't be able to use the devops sync action and will have to have our custom one, because the devops action can't handle these conflicts; but no matter

@openshift-ci openshift-ci bot added the lgtm label Jan 27, 2025
@atheo89 atheo89 added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Jan 27, 2025
@openshift-ci openshift-ci bot removed the lgtm label Jan 27, 2025
@atheo89
Copy link
Member Author

atheo89 commented Jan 27, 2025

/override ci/prow/images

Copy link

openshift-ci bot commented Jan 27, 2025

@atheo89: Overrode contexts on behalf of atheo89: ci/prow/images

In response to this:

/override ci/prow/images

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.

@atheo89
Copy link
Member Author

atheo89 commented Jan 27, 2025

/lgtm this looks like the tried and true strategy from odh-io/kubeflow; it's just that we won't be able to use the devops sync action and will have to have our custom one, because the devops action can't handle these conflicts; but no matter

That's true, however, when we onboard onto Konflux, we'll have a better understanding of how to handle this more efficiently. Until then, we'll need to fast track the current procedure to keep things moving forward.

@atheo89 atheo89 requested a review from jiridanek January 27, 2025 11:08
@jiridanek
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Jan 27, 2025
@atheo89
Copy link
Member Author

atheo89 commented Jan 27, 2025

/override ci/prow/images

Copy link

openshift-ci bot commented Jan 27, 2025

@atheo89: Overrode contexts on behalf of atheo89: ci/prow/images

In response to this:

/override ci/prow/images

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.

@atheo89
Copy link
Member Author

atheo89 commented Jan 30, 2025

I will approve this to have it ready for the upcoming release

/approve

Copy link

openshift-ci bot commented Jan 30, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atheo89

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

@openshift-merge-bot openshift-merge-bot bot merged commit d79b8e8 into red-hat-data-services:main Jan 30, 2025
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved lgtm tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants