Skip to content

Commit 081abc1

Browse files
committed
[e2e] Drop Windows Server 2019 support
This commit removes Server2019 from supported versions, provider image selectors,container image selection, and PowerShell compatibility workarounds. All available Azure Marketplace images for the 2019-datacenter-smalldisk SKU have the OpenSSH regression introduced in KB5044277 (Oct 2024, OS Build 17763.6414). The previously pinned version 17763.6293.240905 has been deprecated and removed. Windows Server 2019 mainstream support ended January 2024.
1 parent 86c5888 commit 081abc1

File tree

6 files changed

+2
-21
lines changed

6 files changed

+2
-21
lines changed

test/e2e/network_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -864,8 +864,6 @@ func (tc *testContext) getPodIP(selector metav1.LabelSelector) (string, error) {
864864
// getWindowsServerContainerImage gets the appropriate WindowsServer image based on the OS version
865865
func (tc *testContext) getWindowsServerContainerImage() string {
866866
switch tc.windowsServerVersion {
867-
case windows.Server2019:
868-
return "mcr.microsoft.com/powershell:lts-nanoserver-1809"
869867
case windows.Server2022:
870868
case windows.Server2025:
871869
// 2022-based container images are compatible with Windows Server 2025

test/e2e/providers/aws/aws.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ func newEC2Client(region string) (*ec2.EC2, error) {
5959
// pattern Windows_Server-$version-variant-YYYY.MM.DD and the filter will grab all AMIs that match the filter.
6060
func getWindowsAMIFilter(windowsServerVersion windows.ServerVersion) string {
6161
switch windowsServerVersion {
62-
case windows.Server2019:
63-
return "Windows_Server-2019-English-Core-Base-????.??.??"
6462
case windows.Server2025:
6563
return "Windows_Server-2025-English-Core-Base-????.??.??"
6664
case windows.Server2022:

test/e2e/providers/azure/azure.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,6 @@ func New(clientset *clusterinfo.OpenShift, infraStatus *config.InfrastructureSta
4747
// newAzureMachineProviderSpec returns an AzureMachineProviderSpec generated from the inputs, or an error
4848
func (p *Provider) newAzureMachineProviderSpec(location, zone, vmSize, publicLoadBalancer string, windowsServerVersion windows.ServerVersion) (*mapi.AzureMachineProviderSpec, error) {
4949
imageVersion := defaultImageVersion
50-
if windowsServerVersion == windows.Server2019 {
51-
// TODO: remove when VM SSH issue is patched in Azure cloud
52-
imageVersion = "17763.6293.240905"
53-
}
5450
return &mapi.AzureMachineProviderSpec{
5551
TypeMeta: meta.TypeMeta{
5652
APIVersion: "azureproviderconfig.openshift.io/v1beta1",
@@ -345,8 +341,6 @@ func (p *Provider) ensureWindowsCSIDaemonSet(client client.Interface) error {
345341
// getImageSKU returns the SKU based on the Windows Server version
346342
func getImageSKU(windowsServerVersion windows.ServerVersion) string {
347343
switch windowsServerVersion {
348-
case windows.Server2019:
349-
return "2019-datacenter-smalldisk"
350344
case windows.Server2025:
351345
return "2025-datacenter-smalldisk"
352346
case windows.Server2022:

test/e2e/providers/gcp/gcp.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,6 @@ func (p *Provider) CreatePVC(_ client.Interface, _ string, _ *core.PersistentVol
106106
// getImage returns the image based on the Windows Server version
107107
func getImage(windowsServerVersion windows.ServerVersion) string {
108108
switch windowsServerVersion {
109-
case windows.Server2019:
110-
return "projects/windows-cloud/global/images/family/windows-2019-core"
111109
case windows.Server2025:
112110
return "projects/windows-cloud/global/images/family/windows-2025-core"
113111
case windows.Server2022:

test/e2e/validation_test.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ import (
3535
"github.com/openshift/windows-machine-config-operator/pkg/secrets"
3636
"github.com/openshift/windows-machine-config-operator/pkg/servicescm"
3737
"github.com/openshift/windows-machine-config-operator/pkg/windows"
38-
e2e_windows "github.com/openshift/windows-machine-config-operator/test/e2e/windows"
3938
)
4039

4140
const (
@@ -354,10 +353,7 @@ func (tc *testContext) ensureTestRunnerRBAC() error {
354353
func (tc *testContext) runPowerShellSSHJob(name, command, ip string) (string, error) {
355354
// Modify command to work when default shell is the newer Powershell version present on Windows Server 2022 and
356355
// later
357-
powershellDefaultCommand := command
358-
if tc.windowsServerVersion != e2e_windows.Server2019 {
359-
powershellDefaultCommand = strings.ReplaceAll(command, "\\\"", "\"")
360-
}
356+
powershellDefaultCommand := strings.ReplaceAll(command, "\\\"", "\"")
361357

362358
keyMountDir := "/private-key"
363359
sshOptions := "-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"

test/e2e/windows/version.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ package windows
33
type ServerVersion string
44

55
const (
6-
// Server2019 represent Windows Server 2019
7-
Server2019 ServerVersion = "2019"
86
// Server2022 represent Windows Server 2022
97
Server2022 ServerVersion = "2022"
108
// Server2025 represent Windows Server 2025
@@ -13,11 +11,10 @@ const (
1311

1412
// SupportedVersions are the Windows Server versions supported by the e2e test.
1513
// "" implies the default which is Server2022
16-
var SupportedVersions = []ServerVersion{Server2019, Server2022, Server2025, ""}
14+
var SupportedVersions = []ServerVersion{Server2022, Server2025, ""}
1715

1816
// BuildNumber returns the build for a given server version as defined by Microsoft
1917
var BuildNumber = map[ServerVersion]string{
20-
Server2019: "10.0.17763",
2118
Server2022: "10.0.20348",
2219
Server2025: "10.0.26100",
2320
}

0 commit comments

Comments
 (0)