diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go index 8d4f084989f..b96aa5b988b 100644 --- a/test/e2e/storage/testsuites/base.go +++ b/test/e2e/storage/testsuites/base.go @@ -18,6 +18,7 @@ package testsuites import ( "fmt" + "strings" "time" . "github.com/onsi/ginkgo" @@ -324,3 +325,15 @@ func deleteStorageClass(cs clientset.Interface, className string) { Expect(err).NotTo(HaveOccurred()) } } + +func skipTestUntilBugfix(issueID string, driverName string, prefixes []string) { + var needSkip bool + for _, prefix := range prefixes { + if strings.HasPrefix(driverName, prefix) { + needSkip = true + } + } + if needSkip { + framework.Skipf("Due to issue #%s, this test with %s doesn't pass, skipping until it fixes", issueID, driverName) + } +} diff --git a/test/e2e/storage/testsuites/volumemode.go b/test/e2e/storage/testsuites/volumemode.go index 360097b66f2..31bdd9c4bd1 100644 --- a/test/e2e/storage/testsuites/volumemode.go +++ b/test/e2e/storage/testsuites/volumemode.go @@ -76,6 +76,7 @@ func createVolumeModeTestInput(pattern testpatterns.TestPattern, resource volume sc: resource.sc, pvc: resource.pvc, pv: resource.pv, + driverName: dInfo.Name, testVolType: pattern.VolType, nodeName: dInfo.Config.ClientNodeName, volMode: pattern.VolMode, @@ -233,6 +234,7 @@ type volumeModeTestInput struct { sc *storagev1.StorageClass pvc *v1.PersistentVolumeClaim pv *v1.PersistentVolume + driverName string testVolType testpatterns.TestVolType nodeName string volMode v1.PersistentVolumeMode @@ -339,6 +341,9 @@ func testVolumeModeSuccessForDynamicPV(input *volumeModeTestInput) { ns := f.Namespace var err error + // TODO: This skip should be removed once #70760 is fixed + skipTestUntilBugfix("70760", input.driverName, []string{"csi-hostpath", "com.google.csi.gcepd"}) + By("Creating sc") input.sc, err = cs.StorageV1().StorageClasses().Create(input.sc) Expect(err).NotTo(HaveOccurred())