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

8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64 #195

Closed
wants to merge 4 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 19, 2024

I backport this for parity with 21.0.3-oracle.

This is a composition of two clean backports. See also separate commits. Will mark as clean.


Progress

  • Change must not contain extraneous whitespace
  • JDK-8319128 needs maintainer approval
  • Commit message must refer to an issue
  • JDK-8319136 needs maintainer approval

Issues

  • JDK-8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64 (Bug - P3 - Approved)
  • JDK-8319136: Skip pkcs11 tests on linux-aarch64 (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk21u-dev.git pull/195/head:pull/195
$ git checkout pull/195

Update a local copy of the PR:
$ git checkout pull/195
$ git pull https://git.openjdk.org/jdk21u-dev.git pull/195/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 195

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk21u-dev/pull/195.diff

Webrev

Link to Webrev Comment

@GoeLin GoeLin changed the base branch from master to pr/187 January 19, 2024 07:39
@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2024

👋 Welcome back goetz! 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 Backport c2e77e2f17b624e750dea8fd51bbfde99596690e 8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64 Jan 19, 2024
@openjdk
Copy link

openjdk bot commented Jan 19, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Jan 19, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 19, 2024

/issue JDK-8319136

@openjdk
Copy link

openjdk bot commented Jan 19, 2024

@GoeLin
Adding additional issue to issue list: 8319136: Skip pkcs11 tests on linux-aarch64.

@GoeLin
Copy link
Member Author

GoeLin commented Jan 19, 2024

/clean

@openjdk openjdk bot added the clean label Jan 19, 2024
@openjdk
Copy link

openjdk bot commented Jan 19, 2024

@GoeLin This backport pull request is now marked as clean

@mlbridge
Copy link

mlbridge bot commented Jan 19, 2024

Webrevs

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/187 to master January 19, 2024 15:51
@openjdk-notifier
Copy link

The parent pull request that this pull request depends on has now been integrated and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout goetz_backport_8319128
git fetch https://git.openjdk.org/jdk21u-dev.git master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

openjdk bot commented Jan 19, 2024

⚠️ @GoeLin This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the approval label Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 2024

@GoeLin 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.

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

8319128: sun/security/pkcs11 tests fail on OL 7.9 aarch64
8319136: Skip pkcs11 tests on linux-aarch64

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

  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64

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 ready Pull request is ready to be integrated and removed approval labels Jan 22, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 23, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 23, 2024

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

  • be8733b: 8319213: Compatibility.java reads both stdout and stderr of JdkUtils
  • fae1a03: 8312416: Tests in Locale should have more descriptive names
  • ada400c: 8318158: RISC-V: implement roundD/roundF intrinsics
  • 1dd2f2a: 8169475: WheelModifier.java fails by timeout
  • e9be531: 8077371: Binary files in JAXP test should be removed
  • 69416f4: 8318809: java/util/concurrent/ConcurrentLinkedQueue/WhiteBox.java shows intermittent failures on linux ppc64le and aarch64

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 23, 2024
@openjdk openjdk bot closed this Jan 23, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 23, 2024
@openjdk
Copy link

openjdk bot commented Jan 23, 2024

@GoeLin Pushed as commit 1f9b03e.

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

@GoeLin GoeLin deleted the goetz_backport_8319128 branch January 23, 2024 08:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
1 participant