Skip to content

Commit b67b2b1

Browse files
committedApr 27, 2021
8265690: Use the latest Ubuntu base image version in Docker testing
Reviewed-by: sgehwolf, iignatyev, mseledtsov
1 parent b2628d1 commit b67b2b1

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed
 

‎test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java

+2-9
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static String getBaseImageName() {
5252
case "s390x":
5353
return "s390x/ubuntu";
5454
default:
55-
return "oraclelinux";
55+
return "ubuntu";
5656
}
5757
}
5858

@@ -63,13 +63,6 @@ static String getBaseImageVersion() {
6363
return version;
6464
}
6565

66-
switch (Platform.getOsArch()) {
67-
case "aarch64":
68-
case "ppc64le":
69-
case "s390x":
70-
return "latest";
71-
default:
72-
return "7.6";
73-
}
66+
return "latest";
7467
}
7568
}

0 commit comments

Comments
 (0)
Please sign in to comment.