8371503: RETAIN_IMAGE_AFTER_TEST do not work for some tests

[sendaoYan]

Hi all,

The DockerTestUtils.RETAIN_IMAGE_AFTER_TEST variable which read the property from "jdk.test.docker.retain.image" do not work for some of the docker tests, such as jdk/internal/platform/docker/TestDockerCpuMetrics.java, only works for some of the docker tests, such as jdk/internal/platform/docker/TestPidsLimit.java.

This PR read the DockerTestUtils.RETAIN_IMAGE_AFTER_TEST inside function removeDockerImage instead of before all the fucntion removeDockerImage. This will make all the docker tests receive the property jdk.test.docker.retain.image.

Change has been verified locally on linux-x64 by run the all touched tests.

---

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

Issue

• JDK-8371503: RETAIN_IMAGE_AFTER_TEST do not work for some tests (Bug - P4)

Reviewers

• Leonid Mesnik (@lmesnik - Reviewer)
• David Holmes (@dholmes-ora - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/28208/head:pull/28208
$ git checkout pull/28208

Update a local copy of the PR:
$ git checkout pull/28208
$ git pull https://git.openjdk.org/jdk.git pull/28208/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 28208

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/28208.diff

Using Webrev

Link to Webrev Comment

[bridgekeeper]

👋 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]

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

8371503: RETAIN_IMAGE_AFTER_TEST do not work for some tests

Reviewed-by: lmesnik, dholmes

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 1 new commit pushed to the master branch:

• 01adf28: 8372974: Add missing @OverRide annotations in "com.sun.java.swing.plaf.gtk" package

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]

@sendaoYan The following labels will be automatically applied to this pull request:

• core-libs
• hotspot-runtime
• serviceability

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 02: Full - Incremental (0bfbe8ae)
• 01: Full - Incremental (5e39c8f3)
• 00: Full (75356d0e)

[sendaoYan]

Looking for 2rd reviewer, since this PR touch files in hotspot directory.

[bridgekeeper]

@sendaoYan This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply issue a /touch or /keepalive command to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

[sendaoYan]

Looking for 2rd reviewer, since this PR touch files in hotspot directory?

[dholmes-ora]

I'm unclear what you mean by some of the tests not working - are you saying those tests did not check the value of RETAIN_IMAGE_AFTER_TEST? Or that they never had it passed in - in which case why not? Where does it come from.

[dholmes-ora]

Pre-existing but indent is too big

[dholmes-ora]

You also need to document the fact the property is used to make this a no-op.

[sendaoYan]

Pre-existing but indent is too big

Fixed.

[sendaoYan]

RETAIN_IMAGE_AFTER_TEST

Some tests did not check the value of the RETAIN_IMAGE_AFTER_TEST variable, causing the docker image to be deleted at the end of the test run even if the -Djdk.test.docker.retain.image=true option was used when running those tests.

[dholmes-ora]

Thanks - now it makes sense to me.

[sendaoYan]

Thanks for the reviews @lmesnik @dholmes-ora

/integrate

[openjdk]

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

• 1f47294: 8287062: com/sun/jndi/ldap/LdapPoolTimeoutTest.java failed due to different timeout message
• f5187eb: 8373599: Cleanup arguments.hpp includes
• 629bf20: 8371408: [Linux] VM.info output for container information is confusing
• ... and 5 more: https://git.openjdk.org/jdk/compare/dc1b0b5f81b6c3de85a0234d0315370b6413c077...master

Your commit was automatically rebased without conflicts.

[openjdk]

@sendaoYan Pushed as commit 34f2413.

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