From 528e77cd5e600b67df781dfd1fd897ebcaea86da Mon Sep 17 00:00:00 2001
From: Mark Vieira <portugee@gmail.com>
Date: Tue, 25 Feb 2020 09:22:45 -0800
Subject: [PATCH] Update Docker on linux exclusion list (#52736)

(cherry picked from commit 5cfbf4dac11225d9f48fc25919e29713dd53a279)
---
 .ci/dockerOnLinuxExclusions                          |  4 +++-
 .../gradle/docker/DockerSupportService.java          |  2 +-
 .../gradle/docker/DockerSupportServiceTests.java     | 12 ++++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.ci/dockerOnLinuxExclusions b/.ci/dockerOnLinuxExclusions
index ab344641baf..4d78cc25848 100644
--- a/.ci/dockerOnLinuxExclusions
+++ b/.ci/dockerOnLinuxExclusions
@@ -9,4 +9,6 @@ debian-8
 opensuse-15-1
 ol-6.10
 ol-7.7
-sles-12
+sles-12.3 # older version used in Vagrant image
+sles-12.4
+sles-15.1
diff --git a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java b/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
index 7ffa83c0ff4..0230e772b97 100644
--- a/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
+++ b/buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
@@ -220,7 +220,7 @@ public abstract class DockerSupportService implements BuildService<DockerSupport
             // remove optional leading and trailing quotes and whitespace
             final String value = parts[1].replaceAll("^['\"]?\\s*", "").replaceAll("\\s*['\"]?$", "");
 
-            values.put(key, value);
+            values.put(key, value.toLowerCase());
         });
 
         return values;
diff --git a/buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java b/buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java
index cba75907011..5258d3cb8e7 100644
--- a/buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java
+++ b/buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java
@@ -38,12 +38,12 @@ public class DockerSupportServiceTests extends GradleIntegrationTestCase {
         expected.put("CPE_NAME", "cpe:/o:oracle:linux:6:10:server");
         expected.put("HOME_URL" + "", "https://linux.oracle.com/");
         expected.put("ID", "ol");
-        expected.put("NAME", "Oracle Linux Server");
-        expected.put("ORACLE_BUGZILLA_PRODUCT" + "", "Oracle Linux 6");
+        expected.put("NAME", "oracle linux server");
+        expected.put("ORACLE_BUGZILLA_PRODUCT" + "", "oracle linux 6");
         expected.put("ORACLE_BUGZILLA_PRODUCT_VERSION", "6.10");
-        expected.put("ORACLE_SUPPORT_PRODUCT", "Oracle Linux");
+        expected.put("ORACLE_SUPPORT_PRODUCT", "oracle linux");
         expected.put("ORACLE_SUPPORT_PRODUCT_VERSION", "6.10");
-        expected.put("PRETTY_NAME", "Oracle Linux Server 6.10");
+        expected.put("PRETTY_NAME", "oracle linux server 6.10");
         expected.put("VERSION", "6.10");
         expected.put("VERSION_ID", "6.10");
 
@@ -58,7 +58,7 @@ public class DockerSupportServiceTests extends GradleIntegrationTestCase {
 
         final Map<String, String> results = parseOsRelease(lines);
 
-        final Map<String, String> expected = Map.of("NAME", "Oracle Linux Server");
+        final Map<String, String> expected = Map.of("NAME", "oracle linux server");
 
         assertThat(expected, equalTo(results));
     }
@@ -71,7 +71,7 @@ public class DockerSupportServiceTests extends GradleIntegrationTestCase {
 
         final Map<String, String> results = parseOsRelease(lines);
 
-        final Map<String, String> expected = Map.of("NAME", "Oracle Linux Server");
+        final Map<String, String> expected = Map.of("NAME", "oracle linux server");
 
         assertThat(expected, equalTo(results));
     }