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

974: Add retry logic to mlbridge when pushing #1130

Closed
wants to merge 1 commit into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Apr 20, 2021

If pushing a webrev to the archive should fail, it is commonly caused by a concurrent push for another webrev. Try to rebase a few times to avoid throwing an error.


Progress

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

Issue

  • SKARA-974: Add retry logic to mlbridge when pushing

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1130

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 20, 2021

👋 Welcome back rwestberg! 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 974 974: Add retry logic to mlbridge when pushing Apr 20, 2021
@openjdk openjdk bot added the rfr label Apr 20, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 20, 2021

Webrevs

@openjdk
Copy link

@openjdk openjdk bot commented Apr 20, 2021

@rwestberg 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:

974: Add retry logic to mlbridge when pushing

Reviewed-by: erikj

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 3 new commits pushed to the master branch:

  • 5d54537: 956: Skara bot is continually trying to process the same PR command
  • 82f0843: 976: Do not send empty emails
  • b8f1016: Add census support for the issue notifier

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this 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 Apr 20, 2021
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Apr 21, 2021

/integrate

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

@openjdk openjdk bot commented Apr 21, 2021

@rwestberg Since your change was applied there have been 4 commits pushed to the master branch:

  • 7a7d15b: 971: Stop clumping up logs in logstash
  • 5d54537: 956: Skara bot is continually trying to process the same PR command
  • 82f0843: 976: Do not send empty emails
  • b8f1016: Add census support for the issue notifier

Your commit was automatically rebased without conflicts.

Pushed as commit aa132b8.

💡 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