Skip to content

Commit 51851ec

Browse files
authored
Merge pull request #1128 from nader-ziada/windows-httpd
use smaller windows httpd image for e2e tests
2 parents 6a80ae3 + fd806fc commit 51851ec

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

test/e2e/kubernetes/windows/windows.go

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,26 +50,12 @@ func (i *WindowsImage) GetImage(version OSVersion) string {
5050
}
5151

5252
func GetWindowsImage(testImage WindowsTestImages, version OSVersion) string {
53-
iisImage := WindowsImage{
54-
BaseImage: "mcr.microsoft.com/windows/servercore/iis",
55-
Tags: map[OSVersion]string{
56-
LTSC2019: "windowsservercore-ltsc2019",
57-
},
58-
}
59-
6053
httpd := WindowsImage{
6154
BaseImage: "k8sprow.azurecr.io/kubernetes-e2e-test-images/httpd",
6255
Tags: map[OSVersion]string{
6356
LTSC2019: "2.4.39-alpine",
6457
},
6558
}
6659

67-
switch testImage {
68-
case IIS:
69-
return iisImage.GetImage(version)
70-
case Httpd:
71-
return httpd.GetImage(version)
72-
default:
73-
return iisImage.GetImage(version)
74-
}
60+
return httpd.GetImage(version)
7561
}

0 commit comments

Comments
 (0)