Skip to content

Add a more robust script for automating the upstream/downstream sync process #351

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

Merged

Conversation

timflannagan
Copy link
Contributor

@timflannagan timflannagan commented Aug 9, 2022

Introduces a scripts/sync.sh bash script that attempts to automate the upstream/downstream sync process locally. Updates the sync_pop_candidates.sh bash script logic, and adds some "smarter" logic for handling common merge conflicts and trying to hack around them. Follow-up work may run this logic in a prowjob periodic and automatically open a PR under a bot account when new commits have been detected.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: timflannagan

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-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 9, 2022
@timflannagan timflannagan force-pushed the scripts/add-sync-script branch 2 times, most recently from 49bc58d to 48c3362 Compare August 9, 2022 19:25
@timflannagan timflannagan force-pushed the scripts/add-sync-script branch from 48c3362 to f79a4f0 Compare August 9, 2022 19:27
@timflannagan timflannagan force-pushed the scripts/add-sync-script branch 3 times, most recently from 81cb3e3 to 8a80bf9 Compare August 9, 2022 19:58
@timflannagan timflannagan changed the title Introduce a helper script for automating the upstream/downstream sync process Add a more robust script for automating the upstream/downstream sync process Aug 9, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Aug 9, 2022

@timflannagan: all tests passed!

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/test-infra repository. I understand the commands that are listed here.

@perdasilva
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Aug 10, 2022
@openshift-merge-robot openshift-merge-robot merged commit 84e208a into openshift:master Aug 10, 2022
@timflannagan timflannagan deleted the scripts/add-sync-script branch August 10, 2022 09:50
@timflannagan timflannagan mentioned this pull request Aug 10, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants