Skip to content

Commit

Permalink
Update Docker on linux exclusion list (#52736)
Browse files Browse the repository at this point in the history
(cherry picked from commit 5cfbf4dac11225d9f48fc25919e29713dd53a279)
  • Loading branch information
mark-vieira committed Feb 25, 2020
1 parent a88d54e commit 528e77c
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 8 deletions.
4 changes: 3 additions & 1 deletion .ci/dockerOnLinuxExclusions
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ static Map<String, String> parseOsRelease(final List<String> osReleaseLines) {
// 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@ public void testParseOsReleaseOnOracle() {
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");

Expand All @@ -58,7 +58,7 @@ public void testRemoveTrailingWhitespace() {

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));
}
Expand All @@ -71,7 +71,7 @@ public void testRemoveComments() {

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));
}
Expand Down

0 comments on commit 528e77c

Please sign in to comment.