Skip to content

8309138: Fix container tests for jdks with symlinked conf dir #538

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

Closed
wants to merge 3 commits into from

Conversation

sendaoYan
Copy link
Member

@sendaoYan sendaoYan commented Jul 8, 2024

Hi all
This is backport of JDK-8309138, to fix the testcase bug, which if the tested jdk directory is symlinked, symlinks are followed when copying tested jdk.
Only change the testcase lib file, the risk is low.

This backport not clean, because of this PR include the same change to the Hotspot copy of DockerTestUtils.java

Additional testing:

  • jdk/test/jdk/internal/platform/docker
  • hotspot/test/runtime/containers/docker

docker-tests.log


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8309138 needs maintainer approval

Issue

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

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 538

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jul 8, 2024

👋 Welcome back syan! 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
Copy link

openjdk bot commented Jul 8, 2024

@sendaoYan 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

Reviewed-by: phh, sgehwolf

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

  • 4fe22e8: 6544871: java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html fails from jdk b09 on windows.
  • 855480b: 8334905: [8u] The test java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java started to fail after 8159690
  • 4c9c5a4: 8327007: javax/swing/JSpinner/8008657/bug8008657.java fails
  • 8b28c35: 8264328: Broken license in javax/swing/JComboBox/8072767/bug8072767.java
  • 2afd918: 8221903: PIT: javax/swing/RepaintManager/IconifyTest/IconifyTest.java fails on ubuntu18.04
  • 439e910: 8321480: ISO 4217 Amendment 176 Update
  • edbdf05: 8336928: GHA: Bundle artifacts removal broken
  • 1ca84ad: 8305400: ISO 4217 Amendment 175 Update
  • ea76f37: 8338144: [8u] Remove duplicate license files
  • fb0a658: 8335894: [8u] Fix SupplementalJapaneseEraTest.java for jdks with symlinked conf dir
  • ... and 26 more: https://git.openjdk.org/jdk8u-dev/compare/c8eb027b59dbb12150a1edd926b14fc2f6753bbd...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. Possible candidates are the reviewers of this PR (@phohensee, @jerboaa) but any other Committer may sponsor as well.

➡️ 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 changed the title Backport c1bb926f4d5eaf49777f93b9f8788db243bba83b 8309138: Fix container tests for jdks with symlinked conf dir Jul 8, 2024
@openjdk
Copy link

openjdk bot commented Jul 8, 2024

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

@openjdk
Copy link

openjdk bot commented Jul 8, 2024

⚠️ @sendaoYan 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 rfr Pull request is ready for review label Jul 8, 2024
@mlbridge
Copy link

mlbridge bot commented Jul 8, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jul 8, 2024

@sendaoYan Unknown command request - for a list of valid commands use /help.

@sendaoYan
Copy link
Member Author

/approval request Backport of JDK-8309138 to fix the testcase bug, which if the tested jdk directory is symlinked, symlinks are followed when copying tested jdk. Only change the testcase lib file, the risk is low.

@openjdk
Copy link

openjdk bot commented Jul 8, 2024

@sendaoYan
8309138: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jul 8, 2024
@sendaoYan
Copy link
Member Author

sendaoYan commented Jul 8, 2024

The GHA report several failures.

  1. Some failures are CA issues, which is fixing by PR256. It's unrelated to this PR.
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#digicerttlseccrootg5
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#digicerttlsrsarootg5
security/infra/java/security/cert/CertPathValidator/certification/CAInterop.java#quovadisrootca1g3
  1. Linux x86 gc/concurrentMarkSweep/SystemGCOnForegroundCollector.java report crash CompactibleFreeListSpace::block_size(HeapWord const*), which has been recorded by JDK-8303159, it's unrelated to this PR.
  2. MacOS build fail, the GHA doesn't show any fail logs, maybe it's enviromental issue, or GHA can't pick up MacOS runner.

@sendaoYan
Copy link
Member Author

Thanks for the review.

Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

Please include the same change in the Hotspot copy of DockerTestUtils.java in this backport.

@openjdk openjdk bot removed the clean label Aug 20, 2024
@sendaoYan
Copy link
Member Author

Please include the same change in the Hotspot copy of DockerTestUtils.java in this backport.

Thanks for the advice. The Hotspot copy of DockerTestUtils.java has included the same change just now.

@sendaoYan sendaoYan requested a review from jerboaa August 20, 2024 15:49
Copy link
Contributor

@jerboaa jerboaa left a comment

Choose a reason for hiding this comment

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

LGTM.

@sendaoYan
Copy link
Member Author

/approval request Backport of JDK-8309138 to fix the testcase bug, which if the tested jdk directory is symlinked, symlinks are followed when copying tested jdk. Only change the testcase lib file, the risk is low.

@openjdk
Copy link

openjdk bot commented Aug 20, 2024

@sendaoYan
8309138: The approval request was already up to date.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Aug 20, 2024
@sendaoYan
Copy link
Member Author

Thanks all for the review and approved.
/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 21, 2024
@openjdk
Copy link

openjdk bot commented Aug 21, 2024

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

@jerboaa
Copy link
Contributor

jerboaa commented Aug 21, 2024

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 21, 2024

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

  • 4fe22e8: 6544871: java/awt/event/KeyEvent/KeyTyped/CtrlASCII.html fails from jdk b09 on windows.
  • 855480b: 8334905: [8u] The test java/awt/Mixing/AWT_Mixing/JButtonOverlapping.java started to fail after 8159690
  • 4c9c5a4: 8327007: javax/swing/JSpinner/8008657/bug8008657.java fails
  • 8b28c35: 8264328: Broken license in javax/swing/JComboBox/8072767/bug8072767.java
  • 2afd918: 8221903: PIT: javax/swing/RepaintManager/IconifyTest/IconifyTest.java fails on ubuntu18.04
  • 439e910: 8321480: ISO 4217 Amendment 176 Update
  • edbdf05: 8336928: GHA: Bundle artifacts removal broken
  • 1ca84ad: 8305400: ISO 4217 Amendment 175 Update
  • ea76f37: 8338144: [8u] Remove duplicate license files
  • fb0a658: 8335894: [8u] Fix SupplementalJapaneseEraTest.java for jdks with symlinked conf dir
  • ... and 26 more: https://git.openjdk.org/jdk8u-dev/compare/c8eb027b59dbb12150a1edd926b14fc2f6753bbd...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 21, 2024
@openjdk openjdk bot closed this Aug 21, 2024
@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 Aug 21, 2024
@openjdk
Copy link

openjdk bot commented Aug 21, 2024

@jerboaa @sendaoYan Pushed as commit 933c78e.

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

@sendaoYan sendaoYan deleted the jbs8309138 branch August 21, 2024 09:07
@sendaoYan
Copy link
Member Author

Thanks for the sponsor.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants