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

8360533: ContainerRuntimeVersionTestUtils fromVersionString fails with some docker versions

Browse Source 
Reviewed-by: lucy, mdoerr, dholmes
This commit is contained in:
Matthias Baesken 2025-06-27 07:37:44 +00:00
parent 01b15bc1f9
commit 97ec9d3e0a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/lib/jdk/test/lib/containers/docker/ContainerRuntimeVersionTestUtils.java
View File

@ -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());
}
}
}