Skip to content

Commit 1242965

Browse files
committed
Drop RHEL 7 and derivatives
Scientific Linux is completely gone
1 parent a960fc6 commit 1242965

File tree

5 files changed

+4
-12
lines changed

5 files changed

+4
-12
lines changed

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ On Windows computers, the plugin assigns a label based on the Windows feature up
6767
Feature update labels use a two digit year and a two digit month representation.
6868
Common values for Windows feature update are `1809`, `1903`, `2009`, and `2109`.
6969

70-
On Linux computers, the plugin uses the output of the [`lsb_release`](https://linux.die.net/man/1/lsb_release) command.
70+
On Linux computers, the plugin uses the output of the [`lsb_release`](https://linux.die.net/man/1/lsb_release) command if the command is available.
7171

7272
If `lsb_release` is not installed, labels on Linux agents will be guessed based on values in `/etc/os-release`.
7373
Red Hat Linux 9 and its derivatives intentionally do not delivery `lsb_release`.
7474

75-
Red Hat Linux and Scientific Linux agents have another fallback based on `/etc/redhat-release`.
75+
Red Hat Linux agents have another fallback based on `/etc/redhat-release`.
7676

7777
Agents with an older version of SuSE Linux will fallback to `/etc/SuSE-release`. Older versions of this plugin might return "sles" or "SUSE LINUX" as OS name.
7878
This has been unified to "SUSE" as this is the lsb_release ID since 'SLES 12 SP2'.

src/main/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTask.java

-2
Original file line numberDiff line numberDiff line change
@@ -347,8 +347,6 @@ protected PlatformDetails computeLabels(
347347
PREFERRED_LINUX_OS_NAMES.put("rhel", "RedHatEnterprise");
348348
PREFERRED_LINUX_OS_NAMES.put("sles", "SUSE");
349349
PREFERRED_LINUX_OS_NAMES.put("SUSE Linux Enterprise Server", "SUSE");
350-
PREFERRED_LINUX_OS_NAMES.put("Scientific Linux", "Scientific");
351-
PREFERRED_LINUX_OS_NAMES.put("scientific", "Scientific");
352350
PREFERRED_LINUX_OS_NAMES.put("ubuntu", "Ubuntu");
353351
}
354352

src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTaskLsbReleaseTest.java

-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,6 @@ private static String computeExpectedName(String filename) {
112112
if (filename.contains("ubuntu")) {
113113
return "Ubuntu";
114114
}
115-
if (filename.contains("scientific")) {
116-
return "Scientific";
117-
}
118115
if (filename.contains("sles")) {
119116
return "SUSE";
120117
}

src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTaskReleaseTest.java

-3
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,6 @@ private static String computeExpectedName(String filename) {
136136
if (filename.contains("ubuntu")) {
137137
return "Ubuntu";
138138
}
139-
if (filename.contains("scientific")) {
140-
return "Scientific";
141-
}
142139
if (filename.contains("sles")) {
143140
return "SUSE";
144141
}

src/test/java/org/jvnet/hudson/plugins/platformlabeler/PlatformDetailsTaskTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,8 @@ void compareOSVersion() throws Exception {
272272
String version = platformDetailsTask.getReleaseIdentifier("VERSION_ID");
273273
/* Check that the version string returned by getReleaseIdentifier
274274
* is at least at the beginning of one of the detail values. Allow
275-
* Debian 10 and CentOS 7 to report their base version
276-
* in the /etc/os-release file without reporting their incremental
275+
* Debian 10 to report its base version
276+
* in the /etc/os-release file without reporting the incremental
277277
* version.
278278
*
279279
* If Debian unstable is in a freeze, then /etc/os-release

0 commit comments

Comments
 (0)