Skip to content

8341138: Rename jtreg property docker.support as container.support#3924

Closed
GoeLin wants to merge 2 commits intoopenjdk:masterfrom
GoeLin:goetz_backport_8341138
Closed

8341138: Rename jtreg property docker.support as container.support#3924
GoeLin wants to merge 2 commits intoopenjdk:masterfrom
GoeLin:goetz_backport_8341138

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 12, 2025

I backport this to make later backports clean.

test/hotspot/jtreg/TEST.ROOT
test/jdk/TEST.ROOT
Resolved due to context.

test/hotspot/jtreg/containers/docker/TestJFREvents.java
Resolved due to context.

test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
Resolved Copyright due to context.

test/jtreg-ext/requires/VMProps.java
Several larger resolves and additional edits needed.
'
Update:
This change depends on a refactoring in VMProps.java. No big thing,
but not nice as this test support coding has frequent updates in backports
and thus it's useful to keep it as close to head as possible.
The refactoring came with "8333446: Add tests for hierarchical container support"
a change that on first sight looks like a nice want-to-have for 17, especially as it
backports clean. But it depends on larger functional changes in 21 we do
not want to backport to 17.
So I now decided to take the refactoring of VMProps from 8333446 and include
it in this change, see also the first commit.


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-8341138 needs maintainer approval

Issue

  • JDK-8341138: Rename jtreg property docker.support as container.support (Enhancement - P4 - Approved)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 3924

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 12, 2025

👋 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
Copy link

openjdk bot commented Sep 12, 2025

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

8341138: Rename jtreg property docker.support as container.support

Reviewed-by: mbaesken

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 23 new commits pushed to 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 changed the title backport 41ee582df8c65f2f26b21e46784cf0bc4ece0585 8341138: Rename jtreg property docker.support as container.support Sep 12, 2025
@openjdk
Copy link

openjdk bot commented Sep 12, 2025

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 rfr Pull request is ready for review labels Sep 12, 2025
@mlbridge
Copy link

mlbridge bot commented Sep 12, 2025

Webrevs

@GoeLin GoeLin marked this pull request as draft September 12, 2025 11:49
@openjdk openjdk bot removed the rfr Pull request is ready for review label Sep 12, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Sep 13, 2025

GHA failure: crash in C2 on macos x86. Twice the same crash!
Unrelated to this test, but was a recent C2 change the cause?

@GoeLin GoeLin marked this pull request as ready for review September 16, 2025 09:10
@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 16, 2025
@GoeLin GoeLin force-pushed the goetz_backport_8341138 branch from 55351cb to e625d1c Compare September 17, 2025 06:58
@openjdk
Copy link

openjdk bot commented Sep 17, 2025

@GoeLin Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

@openjdk
Copy link

openjdk bot commented Sep 18, 2025

⚠️ @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 approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Sep 18, 2025
@GoeLin
Copy link
Member Author

GoeLin commented Sep 22, 2025

/integrate

@openjdk
Copy link

openjdk bot commented Sep 22, 2025

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 22, 2025

@GoeLin Pushed as commit d2302a8.

💡 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_8341138 branch September 22, 2025 11:15
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 integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants