8371503: RETAIN_IMAGE_AFTER_TEST do not work for some tests

SendaoYan · SendaoYan · commit 34f241317ecd · 2025-12-15T14:18:46.000Z
Reviewed-by: lmesnik, dholmes
diff --git a/test/hotspot/jtreg/containers/docker/DockerBasicTest.java b/test/hotspot/jtreg/containers/docker/DockerBasicTest.java
@@ -54,9 +54,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
@@ -57,9 +57,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
@@ -85,9 +85,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
@@ -102,9 +102,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
@@ -53,9 +53,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
@@ -62,9 +62,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
@@ -291,7 +291,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
`@@ -54,9 +54,7 @@ public static void main(String[] args) throws Exception {`
`54`	`54`	`testHelloDocker();`
`55`	`55`	`testJavaVersionWithCgMounts();`
`56`	`56`	`} finally {`
`57`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`58`		`- DockerTestUtils.removeDockerImage(imageNameAndTag);`
`59`		`- }`
	`57`	`+ DockerTestUtils.removeDockerImage(imageNameAndTag);`
`60`	`58`	`}`
`61`	`59`	`}`
`62`	`60`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,7 @@ public static void main(String[] args) throws Exception {`
`57`	`57`	`try {`
`58`	`58`	`test();`
`59`	`59`	`} finally {`
`60`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`61`		`- DockerTestUtils.removeDockerImage(imageName);`
`62`		`- }`
	`60`	`+ DockerTestUtils.removeDockerImage(imageName);`
`63`	`61`	`}`
`64`	`62`	`}`
`65`	`63`
Original file line number	Diff line number	Diff line change
`@@ -85,9 +85,7 @@ public static void main(String[] args) throws Exception {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`} finally {`
`88`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`89`		`- DockerTestUtils.removeDockerImage(imageName);`
`90`		`- }`
	`88`	`+ DockerTestUtils.removeDockerImage(imageName);`
`91`	`89`	`}`
`92`	`90`	`}`
`93`	`91`
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
`@@ -102,9 +102,7 @@ public static void main(String[] args) throws Exception {`
`102`	`102`	`testMetricsSwapExceedingPhysical();`
`103`	`103`	`testContainerMemExceedsPhysical();`
`104`	`104`	`} finally {`
`105`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`106`		`- DockerTestUtils.removeDockerImage(imageName);`
`107`		`- }`
	`105`	`+ DockerTestUtils.removeDockerImage(imageName);`
`108`	`106`	`}`
`109`	`107`	`}`
`110`	`108`
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
`@@ -53,9 +53,7 @@ public static void main(String[] args) throws Exception {`
`53`	`53`	`"150M", Integer.toString(0)`
`54`	`54`	`);`
`55`	`55`	`} finally {`
`56`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`57`		`- DockerTestUtils.removeDockerImage(imageName);`
`58`		`- }`
	`56`	`+ DockerTestUtils.removeDockerImage(imageName);`
`59`	`57`	`}`
`60`	`58`	`}`
`61`	`59`
Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,7 @@ public static void main(String[] args) throws Exception {`
`62`	`62`	`try {`
`63`	`63`	`testLimitUpdates();`
`64`	`64`	`} finally {`
`65`		`- if (!DockerTestUtils.RETAIN_IMAGE_AFTER_TEST) {`
`66`		`- DockerTestUtils.removeDockerImage(imageName);`
`67`		`- }`
	`65`	`+ DockerTestUtils.removeDockerImage(imageName);`
`68`	`66`	`}`
`69`	`67`	`}`
`70`	`68`
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`