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

Backport security level should be inherited from main issue #1110

Closed
wants to merge 1 commit into from

Conversation

erikj79
Copy link
Member

@erikj79 erikj79 commented Apr 8, 2021

This is a change Robin prepared, but we need to deploy it ASAP to match the new behavior in the backport plugin after the Jira upgrade. The security level of a backport should simply be based on the security level of the primary bug.


Progress

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1110

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Apr 8, 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 added the rfr label Apr 8, 2021
@mlbridge
Copy link

@mlbridge mlbridge bot commented Apr 8, 2021

Webrevs

Copy link
Member

@kevinrushforth kevinrushforth left a comment

Looks good to me (although I am not a Skara project Reviewer).

// If the parent issue has a security level (can be configured when running a test manually) it should be propagated
if (level != null) {
assertEquals(level.asString(), backport.properties().get("security").asString());
}
Copy link
Member

@kevinrushforth kevinrushforth Apr 8, 2021

Choose a reason for hiding this comment

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

Maybe also worth also checking that if level is null, the returned property is empty? This could be done as a follow-up given the need to get this in right away.

@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Apr 8, 2021

The tests failed because they were run while JBS was down. There are apparently tests needing to touch JBS in there. I have rerun locally after JBS came up and it's all green.

jddarcy
jddarcy approved these changes Apr 8, 2021
@openjdk
Copy link

@openjdk openjdk bot commented Apr 8, 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:

Backport security level should be inherited from main issue

Reviewed-by: kcr, darcy

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 Apr 8, 2021
@erikj79
Copy link
Member Author

@erikj79 erikj79 commented Apr 8, 2021

/integrate

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

@openjdk openjdk bot commented Apr 8, 2021

@erikj79 Pushed as commit 35dd1da.

💡 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
3 participants