merge-bot: create integrateable pull requests

[edvbld]

Hi all,

please review this patch that makes the merge bot creates pull requests that can be integrated. With this new version of the merge bot contributors will be able to update the "merge style" PR created by the automatic merge bot. This should reduce the overhead quite a bit for resolving a merge conflict.

With the new workflow a contributor would have to something like the following (assuming they have a remote named openjdk-bot):

$ git fetch openjdk-bot
$ git checkout openjdk-bot/17
$ git merge <target branch>
$ # fix merge conflicts
$ git add -u
$ git commit -m "Merge <from branch>"
$ git push

Testing:

• make test
• Updated unit tests

Thanks,
Erik

---

Progress

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

Reviewers

• Robin Westberg (rwestberg - Reviewer)

Download

$ git fetch https://git.openjdk.java.net/skara pull/557/head:pull/557
$ git checkout pull/557

[bridgekeeper]

👋 Welcome back ehelin! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request.

[mlbridge]

Webrevs

• 03: Full - Incremental (fad4dd4)
• 02: Full - Incremental (8a59524)
• 01: Full - Incremental (7f84c6b)
• 00: Full (85d5250)

[rwestberg]

Looks good, nice improvement! I think it would be useful with an additional test that performs the /sponsor command as well and validates the actual pushed commit, to ensure that author and committer is set properly.

[edvbld]

/test

[openjdk]

Could not create test job

[edvbld]

/test

[openjdk]

Could not create test job

[openjdk]

Could not create test job

[edvbld]

/test

[openjdk]

Could not create test job

[openjdk]

A test job has been started with id: github.com-193500053-557-607654934

[rwestberg]

Looks good!

[rwestberg]

Remove?

[openjdk]

@edvbld This change now passes all automated pre-integration checks. When the change also fulfills all project specific requirements, type /integrate in a new comment to proceed. After integration, the commit message will be:

merge-bot: create integrateable pull requests

Reviewed-by: rwestberg

• If you would like to add a summary, use the /summary command.
• To credit additional contributors, use the /contributor command.
• To add additional solved issues, use the /solves command.

Since the source branch of this PR was last updated there have been 4 commits pushed to the master branch. Since there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge master into your branch, and then specify the current head hash when integrating, like this: /integrate 4da64c84299a3920cb25043b68f6cae5bccaf72a.

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

[edvbld]

/integrate

[openjdk]

@edvbld The following commits have been pushed to master since your change was applied:

• 4da64c8: 352: Set X-Git-URL and X-Git-Changeset headers for push notification emails
• 46c6d8d: Parse the bidirectional option properly
• 60a1030: 278: Enhance the /solves command
• d48c124: Allow disabling bidirectional mailing list syncing per repo

Your commit was automatically rebased without conflicts.

Pushed as commit 921411f.

[mlbridge]

Mailing list message from Erik Helin on skara-dev:

Changeset: 921411f
Author: Erik Helin <ehelin at openjdk.org>
Date: 2020-04-03 09:39:28 +0000
URL: https://git.openjdk.java.net/skara/commit/921411f1

merge-bot: create integrateable pull requests

Reviewed-by: rwestberg

! bots/merge/build.gradle
! bots/merge/src/main/java/module-info.java
! bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java
! bots/merge/src/test/java/org/openjdk/skara/bots/merge/MergeBotTests.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/WebrevStorage.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/AdditionalConfiguration.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/CheckRun.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/IntegrateCommand.java
! bots/pr/src/main/java/org/openjdk/skara/bots/pr/PullRequestInstance.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/MergeTests.java
! bots/pr/src/test/java/org/openjdk/skara/bots/pr/SponsorTests.java
! cli/src/main/java/org/openjdk/skara/cli/GitInfo.java
! cli/src/main/java/org/openjdk/skara/cli/pr/Utils.java
! issuetracker/src/main/java/org/openjdk/skara/issuetracker/Comment.java
! jcheck/src/main/java/org/openjdk/skara/jcheck/JCheckConfiguration.java