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

Retry/Rerun PR Autocherrypick post merge #15535

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

jyejare
Copy link
Member

@jyejare jyejare commented Jun 28, 2024

Problem Statement

Following are the scenarios when we were not able to rerun the Merged PRs AutoCherrypick:

  • Autocherrypicking failed due to OOM/unidentified_abort during ACP GHA run
  • Missed adding the version label while autocherrypicking for a specific version
  • Retry of AutoCherrypicking of a big PR when failed with conflicts due to others didn't cherry-pick the changes. Now we could ask others to fix their cherrypicks and simply retry the big PRs ACP from this GHA.
  • Bulk PRs cherry-pick in about to depreciate branch, but need the branch for immediate testing or for multiple reasons
  • etc

Solution

  • We should be able to handle all the above scenarios now with the new standalone Retry Merged PRs AutoCherryPick

Related PR:

Tip:

Do as many retries as you want and we wont create issues for failures, because you will have one already from original AutoCherryPick GHA. Good Luck 👍

Example usage:

  • Go to Actions tab in Robottelo Github Repository
  • Select Retry Merged PRs AutoCherryPick GHA from left pane.
  • Choose to run the workflow from the dropdown in the right corner.
  • Select a branch to run the workflow from or where the PR exists for cherry-picking. E.g master to cherry-pick from stream branch
  • Next, enter parent PR number
  • Next, comma-separated list of branches to cherry-pick the PR into.
Screenshot 2024-06-28 at 4 13 35 PM

Testing (Success) :

https://github.com/jyejare/test-acp/actions/runs/9661992453/job/26651194469

@jyejare jyejare requested a review from a team as a code owner June 28, 2024 10:45
@jyejare jyejare added CherryPick PR needs CherryPick to previous branches 6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 labels Jun 28, 2024
@jyejare jyejare requested a review from omkarkhatavkar July 1, 2024 07:07
Copy link
Contributor

@vijaysawant vijaysawant left a comment

Choose a reason for hiding this comment

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

  • Adding comments/suggestions based on my understanding about use of apostrophe
  • Use of correct form for word PRs & PR's

PRs: Plural form (correct usage for multiple Pull Requests)
PR's: Possessive form (correct usage for indicating something that belongs to a single Pull Request)

Copy link

@omkarkhatavkar omkarkhatavkar left a comment

Choose a reason for hiding this comment

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

LGTM, minor enhancements

@jyejare
Copy link
Member Author

jyejare commented Jul 12, 2024

@vijaysawant I could only make changes of apostrophe in description field, rest are identifiers of actions so cant use there.

@omkarkhatavkar omkarkhatavkar merged commit b5119df into SatelliteQE:master Jul 12, 2024
8 checks passed
github-actions bot pushed a commit that referenced this pull request Jul 12, 2024
Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)
github-actions bot pushed a commit that referenced this pull request Jul 12, 2024
Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)
github-actions bot pushed a commit that referenced this pull request Jul 12, 2024
Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)
jyejare added a commit that referenced this pull request Aug 20, 2024
Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)
jyejare added a commit that referenced this pull request Aug 20, 2024
Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)
jyejare added a commit that referenced this pull request Aug 20, 2024
Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)
jyejare added a commit that referenced this pull request Aug 20, 2024
Retry/Rerun PR Autocherrypick post merge (#15535)

Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)

Co-authored-by: Jitendra Yejare <jyejare@redhat.com>
jyejare added a commit that referenced this pull request Aug 20, 2024
Retry/Rerun PR Autocherrypick post merge (#15535)

Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)

Co-authored-by: Jitendra Yejare <jyejare@redhat.com>
jyejare added a commit that referenced this pull request Aug 20, 2024
Retry/Rerun PR Autocherrypick post merge (#15535)

Parent PR Autocherrypick post merge

(cherry picked from commit b5119df)

Co-authored-by: Jitendra Yejare <jyejare@redhat.com>
jyejare added a commit to jyejare/robottelo that referenced this pull request Oct 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.13.z Introduced in or relating directly to Satellite 6.13 6.14.z Introduced in or relating directly to Satellite 6.14 6.15.z Introduced in or relating directly to Satellite 6.15 CherryPick PR needs CherryPick to previous branches
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants