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

251: Bypass PR update cache when the cooldown period expires for a bridge candidate #388

Closed
wants to merge 2 commits into from

Conversation

rwestberg
Copy link
Member

@rwestberg rwestberg commented Jan 31, 2020

Hi all,

Please review this change that ensures that the mailing list bridge bot retries the bridge operation if it was initially delayed due to the configured cooldown period.

Best regards,
Robin

Progress

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

Issue

SKARA-251: Bypass PR update cache when the cooldown period expires for a bridge candidate

Approvers

  • Erik Helin (ehelin - Reviewer)

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 31, 2020

👋 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.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 31, 2020

Webrevs

Copy link
Member

@edvbld edvbld left a comment

Nice work! Couldn't getUniqueId() just be replaced by pr.webUrl()?

}

public synchronized boolean inQuarantine(PullRequest pr) {
var uniqueId = getUniqueId(pr);
Copy link
Member

@edvbld edvbld Jan 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var uniqueId = getUniqueId(pr);
var uniqueId = pr.webUrl();

Copy link
Member Author

@rwestberg rwestberg Feb 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds reasonable!

}

public synchronized void updateQuarantineEnd(PullRequest pr, Instant end) {
var uniqueId = getUniqueId(pr);
Copy link
Member

@edvbld edvbld Jan 31, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
var uniqueId = getUniqueId(pr);
var uniqueId = pr.webUrl();

edvbld
edvbld approved these changes Feb 6, 2020
Copy link
Member

@edvbld edvbld left a comment

Looks good, thanks for the update!

@openjdk
Copy link

@openjdk openjdk bot commented Feb 6, 2020

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

251: Bypass PR update cache when the cooldown period expires for a bridge candidate

Reviewed-by: ehelin
  • 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 15 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 3cbdfd40a43629eec945d29d2cf5b75a9e4241bb.

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

@openjdk openjdk bot added the ready label Feb 6, 2020
@rwestberg
Copy link
Member Author

@rwestberg rwestberg commented Feb 6, 2020

/integrate

@openjdk openjdk bot closed this Feb 6, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Feb 6, 2020
@openjdk
Copy link

@openjdk openjdk bot commented Feb 6, 2020

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

  • 72c721a: 257: Proper setting of custom fields in Jira issues
  • ca0bc83: 255: Improve git repository health check
  • c08e9a6: 266: Allow getting commit metadata for a range
  • c80ca80: Do not use pull in merge bot
  • 5c96b1c: Improve merge bot commit message
  • 28d695b: Fix git issues with merge bot
  • 6cc53a0: Fix markdown formatting in /csr command
  • 189ade6: Use very defensive programming in CSRCommand
  • 5632c91: 260: CSR command should handle null resolution
  • ce4ae7b: Typo in conversion from legacy jcheck conf
  • 1d0c6a5: 258: jcheck reviewers check has wrong default values
  • 39831e6: 256: Multiple [Integrated] messages can still be sent
  • 833d8ed: Fix problem with ignoring links in Jira
  • ca9b2d4: 253: Add note about git-publish to README

Your commit was automatically rebased without conflicts.

Pushed as commit 3cbdfd4.

@mlbridge
Copy link

@mlbridge mlbridge bot commented Feb 6, 2020

Mailing list message from Robin Westberg on skara-dev:

Changeset: 3cbdfd4
Author: Robin Westberg <rwestberg at openjdk.org>
Date: 2020-02-06 10:31:47 +0000
URL: https://git.openjdk.java.net/skara/commit/3cbdfd40

251: Bypass PR update cache when the cooldown period expires for a bridge candidate

Reviewed-by: ehelin

! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ArchiveWorkItem.java
+ bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/CooldownQuarantine.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBot.java
! bots/mlbridge/src/main/java/org/openjdk/skara/bots/mlbridge/ReviewArchive.java
! bots/mlbridge/src/test/java/org/openjdk/skara/bots/mlbridge/MailingListBridgeBotTests.java
! forge/src/main/java/org/openjdk/skara/forge/PullRequestUpdateCache.java

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