Skip to content

Commit 06b04fa

Browse files
authored
Add Windows Server 2025 test data and documentation (#1912)
1 parent 835c298 commit 06b04fa

3 files changed

Lines changed: 8 additions & 2 deletions

File tree

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ Labels commonly include operating system name, version, architecture, and Window
4646
| Windows Server 2016 | `WindowsServer2016`| `10.0` | `amd64` | // EOL: 12 Jan 2027
4747
| Windows Server 2019 | `WindowsServer2019`| `10.0` | `amd64` | // EOL: 9 Jan 2029
4848
| Windows Server 2022 | `WindowsServer2022`| `10.0` | `amd64` | // EOL: 14 Oct 2031
49+
| Windows Server 2025 | `WindowsServer2025`| `10.0` | `amd64` | // EOL: 14 Nov 2034
4950

5051
## ARM 64 bit (aarch64)
5152

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,9 @@ protected PlatformDetails computeLabels(
226226
}
227227
}
228228
if (osName.startsWith("Windows Server")) {
229-
if (osName.contains("2022")) {
229+
if (osName.contains("2025")) {
230+
osName = "WindowsServer2025";
231+
} else if (osName.contains("2022")) {
230232
osName = "WindowsServer2022";
231233
} else if (osName.contains("2019")) {
232234
osName = "WindowsServer2019";

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ static Stream<Object[]> generateTestParameters() {
3939
{"Windows Server 2016", "amd64", "10.0"},
4040
{"Windows Server 2019", "amd64", "10.0"},
4141
{"Windows Server 2022", "amd64", "10.0"},
42+
{"Windows Server 2025", "amd64", "10.0"},
4243

4344
/** Windows Server checks that should not include version number */
4445
{"Windows Server 2012", "amd64", "8.0"},
@@ -150,7 +151,9 @@ private static String computeExpectedName(String name) {
150151

151152
private static String computeExpectedOsName(String name) {
152153
if (name.startsWith("Windows Server")) {
153-
if (name.contains("2022")) {
154+
if (name.contains("2025")) {
155+
return "WindowsServer2025";
156+
} else if (name.contains("2022")) {
154157
return "WindowsServer2022";
155158
} else if (name.contains("2019")) {
156159
return "WindowsServer2019";

0 commit comments

Comments
 (0)