Merge pull request #1619 from mboersma/fix-windows-2025

Skip Get-WindowsFeature goss spec for windows-2025
kubernetes-sigs · Oct 24, 2024 · 5101ee6 · 5101ee6
2 parents ebed676 + 87a3ca9
commit 5101ee6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/images/capi/azure_targets.sh b/images/capi/azure_targets.sh
@@ -1,7 +1,7 @@
 VHD_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd"
 VHD_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd"
 SIG_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 rhel-8 windows-2019-containerd windows-2022-containerd windows-2025-containerd flatcar"
-SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd flatcar"
+SIG_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 windows-2022-containerd windows-2025-containerd flatcar"
 SIG_GEN2_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 centos-7 mariner-2 azurelinux-3 flatcar"
 SIG_GEN2_CI_TARGETS="ubuntu-2204 ubuntu-2404 azurelinux-3 flatcar"
 SIG_CVM_TARGETS="ubuntu-2004 ubuntu-2204 ubuntu-2404 windows-2019-containerd windows-2022-containerd"

diff --git a/images/capi/packer/goss/goss-package.yaml b/images/capi/packer/goss/goss-package.yaml
@@ -76,9 +76,11 @@ package:
 
 #################################################################################
 ######## TODO: [SEPTEMBER 2024] Revert timeout to 60000ms after image GA ########
-# The WS2025 preview image build is failing due to timeout issues when running 
-# PowerShell command to Get Windows Features.
+# The WS2025 preview image build is failing due to timeout issues when running
+# PowerShell command to Get Windows Features, although the features are enabled.
+# Skip this test on WS2025 for now.
 {{ if eq .Vars.OS "windows"}} # Windows
+{{ if ne .Vars.distribution_version "2025" }}
 # Workaround until windows features are added to goss
 command:
 {{range $name, $vers := index .Vars .Vars.OS "common-windows-features"}}
@@ -91,3 +93,4 @@ command:
     {{end}}
 {{end}}
 {{end}}
+{{end}}