Skip to content

Conversation

@zzambers
Copy link
Contributor

@zzambers zzambers commented Jun 13, 2023

This backport fixing container tests for jdk with symlinked conf dir (such as fedora/rhel packages). Clean, only affects tests.

Testing:
tier1: OK
containers and jdk/internal/platform: OK


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8309138: Fix container tests for jdks with symlinked conf dir (Bug - P4)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1944

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 13, 2023

👋 Welcome back zzambers! 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 ec55539534d43629c1a47407a8e2e94913034a71 8309138: Fix container tests for jdks with symlinked conf dir Jun 13, 2023
@openjdk
Copy link

openjdk bot commented Jun 13, 2023

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Jun 13, 2023
@openjdk
Copy link

openjdk bot commented Jun 13, 2023

@zzambers This change now passes all automated pre-integration checks.

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

8309138: Fix container tests for jdks with symlinked conf dir

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

  • 3bc72d0: 8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
  • 26652c8: 8308156: VerifyCACerts.java misses blank in error output
  • c1b7fd2: 8223714: HTTPSetAuthenticatorTest could be made more resilient
  • 9fe6ade: 8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
  • 0fdd6dd: 8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
  • d0252df: 8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
  • 7c6beb1: 8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
  • 31fb083: 8217395: Update langtools shell tests to use ${EXE_SUFFIX}
  • b11aa05: 8211343: nsk_jvmti_parseoptions should handle multiple suboptions
  • db37a67: Merge
  • ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/185ad54aac000850abed1b946844f034ee96b269...master

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

@openjdk openjdk bot added ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 13, 2023
@mlbridge
Copy link

mlbridge bot commented Jun 13, 2023

Webrevs

@zzambers
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@zzambers
Your change (at version a1dd714) is now ready to be sponsored by a Committer.

@jerboaa
Copy link
Contributor

jerboaa commented Jun 14, 2023

/sponsor

@openjdk
Copy link

openjdk bot commented Jun 14, 2023

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

  • 3bc72d0: 8242151: Improve OID mapping and reuse among JDK security providers for aliases registration
  • 26652c8: 8308156: VerifyCACerts.java misses blank in error output
  • c1b7fd2: 8223714: HTTPSetAuthenticatorTest could be made more resilient
  • 9fe6ade: 8229912: [TESTBUG] java/net/Socks/SocksIPv6Test fails without IPv6
  • 0fdd6dd: 8224617: (fs) java/nio/file/FileStore/Basic.java found filesystem twice
  • d0252df: 8229348: java/net/DatagramSocket/UnreferencedDatagramSockets.java fails intermittently
  • 7c6beb1: 8219628: [TESTBUG] javadoc/doclet/InheritDocForUserTags fails with -othervm
  • 31fb083: 8217395: Update langtools shell tests to use ${EXE_SUFFIX}
  • b11aa05: 8211343: nsk_jvmti_parseoptions should handle multiple suboptions
  • db37a67: Merge
  • ... and 5 more: https://git.openjdk.org/jdk11u-dev/compare/185ad54aac000850abed1b946844f034ee96b269...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 14, 2023
@openjdk openjdk bot closed this Jun 14, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jun 14, 2023
@openjdk
Copy link

openjdk bot commented Jun 14, 2023

@jerboaa @zzambers Pushed as commit c1bb926.

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

@zzambers
Copy link
Contributor Author

@jerboaa thanks
Could you, please, also sponsor 17?
openjdk/jdk17u-dev#1417

@jerboaa
Copy link
Contributor

jerboaa commented Jun 14, 2023

@jerboaa thanks Could you, please, also sponsor 17? openjdk/jdk17u-dev#1417

Sure. Done.

@zzambers
Copy link
Contributor Author

@jerboaa Thank you

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

Labels

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants