From 55bed0bb66f549a3a42ce8ee0429a7ec777729b7 Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Wed, 31 Mar 2021 17:21:57 +0000 Subject: [PATCH 1/2] skip default storageclass test with windows nodes --- test/e2e/storage/persistent_volumes.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/e2e/storage/persistent_volumes.go b/test/e2e/storage/persistent_volumes.go index b1f6cf2c948..e86d5e7334d 100644 --- a/test/e2e/storage/persistent_volumes.go +++ b/test/e2e/storage/persistent_volumes.go @@ -326,6 +326,12 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() { ginkgo.It("should be reschedulable [Slow]", func() { // Only run on providers with default storageclass e2eskipper.SkipUnlessProviderIs("openstack", "gce", "gke", "vsphere", "azure") + // testsuites/multivolume tests can now run with windows nodes + // This test is not compatible with windows because the default StorageClass + // doesn't have the ntfs parameter, we can't change the status of the cluster + // to add a StorageClass that's compatible with windows which is also the + // default StorageClass + e2eskipper.SkipIfNodeOSDistroIs("windows") numVols := 4 From 1e1252ed8c3bf3bdf2fbe19f482d6a80f84f11bf Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Wed, 31 Mar 2021 19:06:22 +0000 Subject: [PATCH 2/2] use LinuxOnly annotation instead of e2eskipper to skip windows tests --- test/e2e/storage/persistent_volumes.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/test/e2e/storage/persistent_volumes.go b/test/e2e/storage/persistent_volumes.go index e86d5e7334d..e4cedb1de86 100644 --- a/test/e2e/storage/persistent_volumes.go +++ b/test/e2e/storage/persistent_volumes.go @@ -316,7 +316,12 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() { }) }) - ginkgo.Describe("Default StorageClass", func() { + // testsuites/multivolume tests can now run with windows nodes + // This test is not compatible with windows because the default StorageClass + // doesn't have the ntfs parameter, we can't change the status of the cluster + // to add a StorageClass that's compatible with windows which is also the + // default StorageClass + ginkgo.Describe("Default StorageClass [LinuxOnly]", func() { ginkgo.Context("pods that use multiple volumes", func() { ginkgo.AfterEach(func() { @@ -326,12 +331,6 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() { ginkgo.It("should be reschedulable [Slow]", func() { // Only run on providers with default storageclass e2eskipper.SkipUnlessProviderIs("openstack", "gce", "gke", "vsphere", "azure") - // testsuites/multivolume tests can now run with windows nodes - // This test is not compatible with windows because the default StorageClass - // doesn't have the ntfs parameter, we can't change the status of the cluster - // to add a StorageClass that's compatible with windows which is also the - // default StorageClass - e2eskipper.SkipIfNodeOSDistroIs("windows") numVols := 4