openshift-eng / rebasebot Goto Github PK

We have seen failures where the cause was GitHub not having fully processed data from our previous call.

1. Unable to open the pull request, the push was not fuly processed.

Failed to create a pull request: 422 Validation Failed
 Response: {"message":"Validation Failed","errors":[{"resource":"PullRequest","code":"custom","message":"No commits between openshift:master and openshift-metal3:ironic-bot-master"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#create-a-pull-request"}

2. The pull request was opened, but did not contain new commits.
   openshift/openstack-ironic-python-agent#14

When we do rebase from release branch that contains cherry-picked commits from main. The merge base marks these backport commits as downstream commits. Additionally, we incorrectly find base commit on the destination branch. Causing all downstream commits to be reapplied.

One possible solution for this may be marking the "Merge upstream into Destination" commit and trying to find it on the ancestry path from merge-base to destination branch.

Rebasebot creates a .rebase directory in the current working directory by default. If you are not aware of this, you may end up with multiple instances of this directory in your filesystem.

To avoid this, we should consider creating a temporary directory for rebasebot to use, and remove it after the rebasebot finishes.

The logic here is a bit fragile and breaks when the chosen separator is contained in the commit message.