From 97ec9d3e0a6e3455579b567e1f58026f5b168c09 Mon Sep 17 00:00:00 2001
From: Matthias Baesken <mbaesken@openjdk.org>
Date: Fri, 27 Jun 2025 07:37:44 +0000
Subject: [PATCH] 8360533: ContainerRuntimeVersionTestUtils fromVersionString
 fails with some docker versions

Reviewed-by: lucy, mdoerr, dholmes
---
 .../docker/ContainerRuntimeVersionTestUtils.java    | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java b/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java
index 88538e7e780..0d1c3a358ab 100644
--- a/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java
+++ b/test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java
@@ -79,12 +79,21 @@ public class ContainerRuntimeVersionTestUtils implements Comparable<ContainerRun
         try {
             // Example 'docker version 20.10.0 or podman version 4.9.4-rhel'
             String versNums = version.split("\\s+", 3)[2];
+            // On some docker implementations e.g. RHEL8 ppc64le we have the following version output:
+            //    Docker version v25.0.3, build 4debf41
+            // Trim potentially leading 'v' and trailing ','
+            if (versNums.startsWith("v")) {
+                versNums = versNums.substring(1);
+            }
+            int cidx = versNums.indexOf(',');
+            versNums = (cidx != -1) ? versNums.substring(0, cidx) : versNums;
+
             String[] numbers = versNums.split("-")[0].split("\\.", 3);
             return new ContainerRuntimeVersionTestUtils(Integer.parseInt(numbers[0]),
                     Integer.parseInt(numbers[1]),
                     Integer.parseInt(numbers[2]));
         } catch (Exception e) {
-            throw new RuntimeException("Failed to parse container runtime version: " + version);
+            throw new RuntimeException("Failed to parse container runtime version: " + version, e);
         }
     }
 
@@ -104,4 +113,4 @@ public class ContainerRuntimeVersionTestUtils implements Comparable<ContainerRun
     public static ContainerRuntimeVersionTestUtils getContainerRuntimeVersion() {
         return ContainerRuntimeVersionTestUtils.fromVersionString(getContainerRuntimeVersionStr());
     }
-}
\ No newline at end of file
+}