Skip to content

Commit

Permalink
Merge pull request #220 from MarkEWaite/add-opensuse-test-data
Browse files Browse the repository at this point in the history
Add openSUSE test data
  • Loading branch information
MarkEWaite authored Oct 11, 2020
2 parents 9e632f6 + 702e1be commit 795e64a
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -277,6 +277,8 @@ protected PlatformDetails computeLabels(
PREFERRED_LINUX_OS_NAMES.put("linuxmint", "LinuxMint");
PREFERRED_LINUX_OS_NAMES.put("ol", "OracleServer");
PREFERRED_LINUX_OS_NAMES.put("opensuse", "openSUSE");
PREFERRED_LINUX_OS_NAMES.put("opensuse-leap", "openSUSE");
PREFERRED_LINUX_OS_NAMES.put("opensuse-tumbleweed", "openSUSE");
PREFERRED_LINUX_OS_NAMES.put("raspbian", "Raspbian");
PREFERRED_LINUX_OS_NAMES.put("Red Hat Enterprise Linux", "RedHatEnterprise");
PREFERRED_LINUX_OS_NAMES.put("Red Hat Enterprise Linux Server", "RedHatEnterprise");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,12 @@ private static String computeExpectedName(String filename) {
if (filename.contains("sles")) {
return "SUSE";
}
if (filename.contains("opensuse-leap")) {
return "openSUSE";
}
if (filename.contains("opensuse-tumbleweed")) {
return "openSUSE";
}
return filename.toLowerCase(Locale.ENGLISH);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ private static String computeExpectedName(String filename) {
if (filename.contains("linuxmint")) {
return "LinuxMint";
}
if (filename.contains("opensuse")) {
return "openSUSE";
}
if (filename.contains("oraclelinux")) {
return "OracleServer";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ private void assertPlatformDetails(PlatformDetails details) {
is("AmazonAMI"),
is("CentOS"),
is("Debian"),
is("openSUSE"),
is("Raspbian"),
is("Ubuntu")));
// Yes, this is a dirty trick to detect the hardware architecture on some JVM's
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
FROM opensuse/leap:15.2
RUN zypper --non-interactive install -y lsb-release
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
LSB Version: n/a
Distributor ID: openSUSE
Description: openSUSE Leap 15.2
Release: 15.2
Codename: n/a
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
NAME="openSUSE Leap"
VERSION="15.2"
ID="opensuse-leap"
ID_LIKE="suse opensuse"
VERSION_ID="15.2"
PRETTY_NAME="openSUSE Leap 15.2"
ANSI_COLOR="0;32"
CPE_NAME="cpe:/o:opensuse:leap:15.2"
BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/"
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
FROM opensuse/tumbleweed
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
NAME="openSUSE Tumbleweed"
# VERSION="20201004"
ID="opensuse-tumbleweed"
ID_LIKE="opensuse suse"
VERSION_ID="20201004"
PRETTY_NAME="openSUSE Tumbleweed"
ANSI_COLOR="0;32"
CPE_NAME="cpe:/o:opensuse:tumbleweed:20201004"
BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/"
DOCUMENTATION_URL="https://en.opensuse.org/Portal:Tumbleweed"
LOGO="distributor-logo"

0 comments on commit 795e64a

Please sign in to comment.