From b67b2b16457ce31dbf376638c58d6d386853f7cc Mon Sep 17 00:00:00 2001
From: Aleksey Shipilev <shade@openjdk.org>
Date: Tue, 27 Apr 2021 16:36:15 +0000
Subject: [PATCH] 8265690: Use the latest Ubuntu base image version in Docker
 testing

Reviewed-by: sgehwolf, iignatyev, mseledtsov
---
 .../test/lib/containers/docker/DockerfileConfig.java  | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java b/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java
index 61612d3c82c..0e833cd9115 100644
--- a/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java
+++ b/test/lib/jdk/test/lib/containers/docker/DockerfileConfig.java
@@ -52,7 +52,7 @@ public class DockerfileConfig {
             case "s390x":
                 return "s390x/ubuntu";
             default:
-                return "oraclelinux";
+                return "ubuntu";
         }
     }
 
@@ -63,13 +63,6 @@ public class DockerfileConfig {
             return version;
         }
 
-        switch (Platform.getOsArch()) {
-            case "aarch64":
-            case "ppc64le":
-            case "s390x":
-                return "latest";
-            default:
-                return "7.6";
-        }
+        return "latest";
     }
 }