honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Docker on linux exclusion list (#52736) 

(cherry picked from commit 5cfbf4dac11225d9f48fc25919e29713dd53a279)
This commit is contained in:
Mark Vieira 2020-02-25 09:22:45 -08:00
parent a88d54eb2d
commit 528e77cd5e
No known key found for this signature in database
GPG Key ID: CA947EF7E6D4B105
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/dockerOnLinuxExclusions
View File

@ -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

2
buildSrc/src/main/java/org/elasticsearch/gradle/docker/DockerSupportService.java
View File

@ -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;

12
buildSrc/src/test/java/org/elasticsearch/gradle/docker/DockerSupportServiceTests.java
View File

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