robottelo icon indicating copy to clipboard operation
robottelo copied to clipboard

Retry/Rerun PR Autocherrypick post merge

Open jyejare opened this issue 7 months ago • 0 comments

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:

  • https://github.com/jyejare/github-cherry-pick-action/pull/42 Allows to take PR number as an input for cherry-picking

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 avatar Jun 28 '24 10:06 jyejare