8371503: RETAIN_IMAGE_AFTER_TEST do not work for some tests

SendaoYan · SendaoYan · commit 847c59b72cf4 · 2026-03-29T08:13:08.000Z
Backport-of: 34f241317ecd7473cfb6dcc2e6e5cf3a40299e2c
diff --git a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
@@ -55,9 +55,7 @@ public static void main(String[] args) throws Exception {
             testHelloDocker();
             testJavaVersionWithCgMounts();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageNameAndTag);
-            }
+            DockerTestUtils.removeDockerImage(imageNameAndTag);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/ShareTmpDir.java b/test/hotspot/jtreg/containers/docker/ShareTmpDir.java
@@ -58,9 +58,7 @@ public static void main(String[] args) throws Exception {
         try {
             test();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java b/test/hotspot/jtreg/containers/docker/TestCPUAwareness.java
@@ -90,9 +90,7 @@ public static void main(String[] args) throws Exception {
             }
 
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java b/test/hotspot/jtreg/containers/docker/TestLimitsUpdating.java
@@ -63,9 +63,7 @@ public static void main(String[] args) throws Exception {
         try {
             testLimitUpdates();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java b/test/hotspot/jtreg/containers/docker/TestMemoryAwareness.java
@@ -105,9 +105,7 @@ public static void main(String[] args) throws Exception {
             testMetricsSwapExceedingPhysical();
             testContainerMemExceedsPhysical();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/hotspot/jtreg/containers/docker/TestPids.java b/test/hotspot/jtreg/containers/docker/TestPids.java
@@ -63,9 +63,7 @@ public static void main(String[] args) throws Exception {
         try {
             testPids();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java b/test/jdk/jdk/internal/platform/docker/TestDockerMemoryMetrics.java
@@ -81,9 +81,7 @@ public static void main(String[] args) throws Exception {
             testMemorySoftLimit("500m","200m");
 
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java b/test/jdk/jdk/internal/platform/docker/TestGetFreeSwapSpaceSize.java
@@ -52,9 +52,7 @@ public static void main(String[] args) throws Exception {
                 "150M", Integer.toString(0)
             );
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java b/test/jdk/jdk/internal/platform/docker/TestLimitsUpdating.java
@@ -63,9 +63,7 @@ public static void main(String[] args) throws Exception {
         try {
             testLimitUpdates();
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java b/test/jdk/jdk/internal/platform/docker/TestPidsLimit.java
@@ -59,9 +59,7 @@ public static void main(String[] args) throws Exception {
             testPidsLimit("2000");
             testPidsLimit("Unlimited");
         } finally {
-            if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
-                DockerTestUtils.removeDockerImage(imageName);
-            }
+            DockerTestUtils.removeDockerImage(imageName);
         }
     }
 
diff --git a/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java b/test/lib/jdk/test/lib/containers/docker/DockerTestUtils.java
@@ -250,7 +250,9 @@ public static OutputAnalyzer dockerRunJava(DockerRunOptions opts) throws Excepti
      * @throws Exception
      */
     public static void removeDockerImage(String imageNameAndTag) throws Exception {
+        if(!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {
             execute(Container.ENGINE_COMMAND, "rmi", "--force", imageNameAndTag);
+        }
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -55,9 +55,7 @@ public static void main(String[] args) throws Exception {`
`55`	`55`	`testHelloDocker();`
`56`	`56`	`testJavaVersionWithCgMounts();`
`57`	`57`	`} finally {`
`58`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`59`		`- DockerTestUtils.removeDockerImage(imageNameAndTag);`
`60`		`- }`
	`58`	`+ DockerTestUtils.removeDockerImage(imageNameAndTag);`
`61`	`59`	`}`
`62`	`60`	`}`
`63`	`61`
Original file line number	Diff line number	Diff line change
`@@ -58,9 +58,7 @@ public static void main(String[] args) throws Exception {`
`58`	`58`	`try {`
`59`	`59`	`test();`
`60`	`60`	`} finally {`
`61`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`62`		`- DockerTestUtils.removeDockerImage(imageName);`
`63`		`- }`
	`61`	`+ DockerTestUtils.removeDockerImage(imageName);`
`64`	`62`	`}`
`65`	`63`	`}`
`66`	`64`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,7 @@ public static void main(String[] args) throws Exception {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`} finally {`
`93`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`94`		`- DockerTestUtils.removeDockerImage(imageName);`
`95`		`- }`
	`93`	`+ DockerTestUtils.removeDockerImage(imageName);`
`96`	`94`	`}`
`97`	`95`	`}`
`98`	`96`
Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,7 @@ public static void main(String[] args) throws Exception {`
`63`	`63`	`try {`
`64`	`64`	`testLimitUpdates();`
`65`	`65`	`} finally {`
`66`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`67`		`- DockerTestUtils.removeDockerImage(imageName);`
`68`		`- }`
	`66`	`+ DockerTestUtils.removeDockerImage(imageName);`
`69`	`67`	`}`
`70`	`68`	`}`
`71`	`69`
Original file line number	Diff line number	Diff line change
`@@ -105,9 +105,7 @@ public static void main(String[] args) throws Exception {`
`105`	`105`	`testMetricsSwapExceedingPhysical();`
`106`	`106`	`testContainerMemExceedsPhysical();`
`107`	`107`	`} finally {`
`108`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`109`		`- DockerTestUtils.removeDockerImage(imageName);`
`110`		`- }`
	`108`	`+ DockerTestUtils.removeDockerImage(imageName);`
`111`	`109`	`}`
`112`	`110`	`}`
`113`	`111`
Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,7 @@ public static void main(String[] args) throws Exception {`
`81`	`81`	`testMemorySoftLimit("500m","200m");`
`82`	`82`
`83`	`83`	`} finally {`
`84`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`85`		`- DockerTestUtils.removeDockerImage(imageName);`
`86`		`- }`
	`84`	`+ DockerTestUtils.removeDockerImage(imageName);`
`87`	`85`	`}`
`88`	`86`	`}`
`89`	`87`
Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,7 @@ public static void main(String[] args) throws Exception {`
`52`	`52`	`"150M", Integer.toString(0)`
`53`	`53`	`);`
`54`	`54`	`} finally {`
`55`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`56`		`- DockerTestUtils.removeDockerImage(imageName);`
`57`		`- }`
	`55`	`+ DockerTestUtils.removeDockerImage(imageName);`
`58`	`56`	`}`
`59`	`57`	`}`
`60`	`58`
Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,7 @@ public static void main(String[] args) throws Exception {`
`59`	`59`	`testPidsLimit("2000");`
`60`	`60`	`testPidsLimit("Unlimited");`
`61`	`61`	`} finally {`
`62`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`63`		`- DockerTestUtils.removeDockerImage(imageName);`
`64`		`- }`
	`62`	`+ DockerTestUtils.removeDockerImage(imageName);`
`65`	`63`	`}`
`66`	`64`	`}`
`67`	`65`