infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 03:58:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

8371503: RETAIN_IMAGE_AFTER_TEST do not work for some tests

Browse Source 
Reviewed-by: lmesnik, dholmes
This commit is contained in:
SendaoYan 2025-12-15 14:18:46 +00:00
parent 1f47294cd3
commit 34f241317e
11 changed files with 12 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/hotspot/jtreg/containers/docker/DockerBasicTest.java
View File

@ -54,9 +54,7 @@ public class DockerBasicTest {
testHelloDocker();
testJavaVersionWithCgMounts();
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageNameAndTag);
}
DockerTestUtils.removeDockerImage(imageNameAndTag);
}
}

4
test/hotspot/jtreg/containers/docker/ShareTmpDir.java
View File

@ -57,9 +57,7 @@ public class ShareTmpDir {
try {
test();
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
View File

@ -85,9 +85,7 @@ public class TestCPUAwareness {
}
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
View File

@ -63,9 +63,7 @@ public class TestLimitsUpdating {
try {
testLimitUpdates();
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
View File

@ -102,9 +102,7 @@ public class TestMemoryAwareness {
testMetricsSwapExceedingPhysical();
testContainerMemExceedsPhysical();
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/hotspot/jtreg/containers/docker/TestPids.java
View File

@ -63,9 +63,7 @@ public class TestPids {
try {
testPids();
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
View File

@ -81,9 +81,7 @@ public class TestDockerMemoryMetrics {
testMemorySoftLimit("500m","200m");
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
View File

@ -53,9 +53,7 @@ public class TestGetFreeSwapSpaceSize {
"150M", Integer.toString(0)
);
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
View File

@ -62,9 +62,7 @@ public class TestLimitsUpdating {
try {
testLimitUpdates();
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

4
test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
View File

@ -59,9 +59,7 @@ public class TestPidsLimit {
testPidsLimit("2000");
testPidsLimit("Unlimited");
} finally {
if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
DockerTestUtils.removeDockerImage(imageName);
}
DockerTestUtils.removeDockerImage(imageName);
}
}

2
test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
View File

@ -291,7 +291,9 @@ public class DockerTestUtils {
* @throws Exception
*/
public static void removeDockerImage(String imageNameAndTag) throws Exception {
if(!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
execute(Container.ENGINE_COMMAND, "rmi", "--force", imageNameAndTag);
}
}