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

1068: [Backport] Bot finds original commit in wrong repository #1203

Closed
wants to merge 3 commits into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Jul 15, 2021

When the PR bot searches for the original commit for a backport it's more or less random from which repository it will be found. Whatever it finds is posted as a link in a PR comment, and if it points to something weird, that can be confusing (though not strictly incorrect as the change will be the exact same regardless of which repo it is in).

The search feature already has what looks to be a configurable way to limit searching to a set of organizations. Unfortunately, that feature was never used and is currently broken for Github (for Gitlab it's already in use as it's required for the search method we use). Because of this, we usually pick a match from adoptium or SAP today. This patch fixes this for Github (where the query separator is space, not '+'), and I intend to limit the organizations to "openjdk" when deploying this fix.

In addition to this, it would be nice if the exact repo that gets picked is the "correct" one. Unfortunately, there is no really good definition of what the correct repo would be in all cases, and it would be even trickier to implement this in a good way. As an approximate workaround, I've added sorting on repository name length, so we always pick the repo with the shortest name. I believe this will at least give us a better answer than "random" in most cases for a relatively modest cost in performance.

I have experimented with this patch in staging with the playground repo and the behavior I've seen so far is good.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Issue

  • SKARA-1068: [Backport] Bot finds original commit in wrong repository

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/skara pull/1203/head:pull/1203
$ git checkout pull/1203

Update a local copy of the PR:
$ git checkout pull/1203
$ git pull https://git.openjdk.java.net/skara pull/1203/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1203

View PR using the GUI difftool:
$ git pr show -t 1203

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/skara/pull/1203.diff

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jul 15, 2021

👋 Welcome back erikj! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk openjdk bot changed the title SKARA-1068 1068: [Backport] Bot finds original commit in wrong repository Jul 15, 2021
@openjdk openjdk bot added the rfr label Jul 15, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jul 15, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

It looks good. I presume you have tested it? Especially since there aren't any new unit tests added.

@openjdk
Copy link

@openjdk openjdk bot commented Jul 15, 2021

@erikj79 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

🔍 One or more changes in this pull request modifies files in areas of the source code that often require two reviewers. Please consider if this is the case for this pull request, and if so, await a second reviewer to approve this pull request before you integrate it.

🌎 Applicable reviewers for one or more changes in this pull request are spread across multiple different time zones. Please consider waiting with integrating this pull request until it has been out for review for at least 24 hours to give all reviewers a chance to review the pull request.

After integration, the commit message for the final commit will be:

1068: [Backport] Bot finds original commit in wrong repository

Reviewed-by: kcr

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready label Jul 15, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Jul 16, 2021

It looks good. I presume you have tested it? Especially since there aren't any new unit tests added.

I have tested it manually in the playground repo by deploying to staging yes. I could have written new manual junit tests I suppose. If I think I have time for that today I will, but otherwise I would rather get these changes live this week.

@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Jul 16, 2021

/integrate

@openjdk
Copy link

@openjdk openjdk bot commented Jul 16, 2021

Going to push as commit e98965d.
Since your change was applied there have been 4 commits pushed to the master branch:

  • fd42d90: 1058: The mlbridge bot occasionally posts the same comments twice on Github
  • a9de6a6: 1091: "PR body must not be empty" check pointless for clean backports
  • 9b0ca38: 1050: Gitlab MR stuck on missing issue when unbreakable space in PR title
  • db61a39: 1040: Crash in webrev command

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jul 16, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Jul 16, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Jul 16, 2021

@erikj79 Pushed as commit e98965d.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
2 participants