skip tests that uses default storage class when there is no default s…

…torage class installed
openshift · Nov 17, 2021 · 496ccc0 · 496ccc0
1 parent 1367cca
commit 496ccc0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/test/e2e/storage/generic_persistent_volume-disruptive.go b/test/e2e/storage/generic_persistent_volume-disruptive.go
@@ -70,6 +70,7 @@ var _ = utils.SIGDescribe("GenericPersistentVolume[Disruptive]", func() {
 			pv        *v1.PersistentVolume
 		)
 		ginkgo.BeforeEach(func() {
+			e2epv.SkipIfNoDefaultStorageClass(c)
 			framework.Logf("Initializing pod and pvcs for test")
 			clientPod, pvc, pv = createPodPVCFromSC(f, c, ns)
 		})

diff --git a/test/e2e/storage/volume_metrics.go b/test/e2e/storage/volume_metrics.go
@@ -65,6 +65,7 @@ var _ = utils.SIGDescribe("[Serial] Volume metrics", func() {
 		// and the underlying storage driver and therefore don't pass
 		// with other kinds of clusters and drivers.
 		e2eskipper.SkipUnlessProviderIs("gce", "gke", "aws")
+		e2epv.SkipIfNoDefaultStorageClass(c)
 		defaultScName, err = e2epv.GetDefaultStorageClassName(c)
 		framework.ExpectNoError(err)
 

diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go
@@ -669,6 +669,7 @@ var _ = utils.SIGDescribe("Dynamic Provisioning", func() {
 		// Modifying the default storage class can be disruptive to other tests that depend on it
 		ginkgo.It("should be disabled by removing the default annotation [Serial] [Disruptive]", func() {
 			e2eskipper.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure")
+			e2epv.SkipIfNoDefaultStorageClass(c)
 
 			scName, scErr := e2epv.GetDefaultStorageClassName(c)
 			framework.ExpectNoError(scErr)