mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
Merge pull request #105052 from leiyiz/skip-storage-test
tag ginkgo tests affected by pdcsi migration for skipping
This commit is contained in:
commit
f83b16d93d
@ -1113,6 +1113,7 @@ var _ = SIGDescribe("StatefulSet", func() {
|
|||||||
// Do not mark this as Conformance.
|
// Do not mark this as Conformance.
|
||||||
// StatefulSet Conformance should not be dependent on specific applications.
|
// StatefulSet Conformance should not be dependent on specific applications.
|
||||||
ginkgo.It("should creating a working zookeeper cluster", func() {
|
ginkgo.It("should creating a working zookeeper cluster", func() {
|
||||||
|
e2epv.SkipIfNoDefaultStorageClass(c)
|
||||||
appTester.statefulPod = &zookeeperTester{client: c}
|
appTester.statefulPod = &zookeeperTester{client: c}
|
||||||
appTester.run()
|
appTester.run()
|
||||||
})
|
})
|
||||||
@ -1120,6 +1121,7 @@ var _ = SIGDescribe("StatefulSet", func() {
|
|||||||
// Do not mark this as Conformance.
|
// Do not mark this as Conformance.
|
||||||
// StatefulSet Conformance should not be dependent on specific applications.
|
// StatefulSet Conformance should not be dependent on specific applications.
|
||||||
ginkgo.It("should creating a working redis cluster", func() {
|
ginkgo.It("should creating a working redis cluster", func() {
|
||||||
|
e2epv.SkipIfNoDefaultStorageClass(c)
|
||||||
appTester.statefulPod = &redisTester{client: c}
|
appTester.statefulPod = &redisTester{client: c}
|
||||||
appTester.run()
|
appTester.run()
|
||||||
})
|
})
|
||||||
@ -1127,6 +1129,7 @@ var _ = SIGDescribe("StatefulSet", func() {
|
|||||||
// Do not mark this as Conformance.
|
// Do not mark this as Conformance.
|
||||||
// StatefulSet Conformance should not be dependent on specific applications.
|
// StatefulSet Conformance should not be dependent on specific applications.
|
||||||
ginkgo.It("should creating a working mysql cluster", func() {
|
ginkgo.It("should creating a working mysql cluster", func() {
|
||||||
|
e2epv.SkipIfNoDefaultStorageClass(c)
|
||||||
appTester.statefulPod = &mysqlGaleraTester{client: c}
|
appTester.statefulPod = &mysqlGaleraTester{client: c}
|
||||||
appTester.run()
|
appTester.run()
|
||||||
})
|
})
|
||||||
@ -1134,6 +1137,7 @@ var _ = SIGDescribe("StatefulSet", func() {
|
|||||||
// Do not mark this as Conformance.
|
// Do not mark this as Conformance.
|
||||||
// StatefulSet Conformance should not be dependent on specific applications.
|
// StatefulSet Conformance should not be dependent on specific applications.
|
||||||
ginkgo.It("should creating a working CockroachDB cluster", func() {
|
ginkgo.It("should creating a working CockroachDB cluster", func() {
|
||||||
|
e2epv.SkipIfNoDefaultStorageClass(c)
|
||||||
appTester.statefulPod = &cockroachDBTester{client: c}
|
appTester.statefulPod = &cockroachDBTester{client: c}
|
||||||
appTester.run()
|
appTester.run()
|
||||||
})
|
})
|
||||||
|
@ -19,6 +19,7 @@ package apps
|
|||||||
import (
|
import (
|
||||||
"k8s.io/kubernetes/test/e2e/cloud/gcp/common"
|
"k8s.io/kubernetes/test/e2e/cloud/gcp/common"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
|
||||||
"k8s.io/kubernetes/test/e2e/upgrades"
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
||||||
"k8s.io/kubernetes/test/e2e/upgrades/apps"
|
"k8s.io/kubernetes/test/e2e/upgrades/apps"
|
||||||
"k8s.io/kubernetes/test/utils/junit"
|
"k8s.io/kubernetes/test/utils/junit"
|
||||||
@ -38,6 +39,7 @@ var _ = SIGDescribe("stateful Upgrade [Feature:StatefulUpgrade]", func() {
|
|||||||
|
|
||||||
ginkgo.Describe("stateful upgrade", func() {
|
ginkgo.Describe("stateful upgrade", func() {
|
||||||
ginkgo.It("should maintain a functioning cluster", func() {
|
ginkgo.It("should maintain a functioning cluster", func() {
|
||||||
|
e2epv.SkipIfNoDefaultStorageClass(f.ClientSet)
|
||||||
upgCtx, err := common.GetUpgradeContext(f.ClientSet.Discovery())
|
upgCtx, err := common.GetUpgradeContext(f.ClientSet.Discovery())
|
||||||
framework.ExpectNoError(err)
|
framework.ExpectNoError(err)
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ import (
|
|||||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = utils.SIGDescribe("Mounted volume expand", func() {
|
var _ = utils.SIGDescribe("Mounted volume expand [Feature:StorageProvider]", func() {
|
||||||
var (
|
var (
|
||||||
c clientset.Interface
|
c clientset.Interface
|
||||||
ns string
|
ns string
|
||||||
|
@ -59,7 +59,7 @@ const (
|
|||||||
minNodes = 2
|
minNodes = 2
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = utils.SIGDescribe("Pod Disks", func() {
|
var _ = utils.SIGDescribe("Pod Disks [Feature:StorageProvider]", func() {
|
||||||
var (
|
var (
|
||||||
ns string
|
ns string
|
||||||
cs clientset.Interface
|
cs clientset.Interface
|
||||||
|
@ -57,7 +57,7 @@ func initializeGCETestSpec(c clientset.Interface, t *framework.TimeoutContext, n
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Testing configurations of single a PV/PVC pair attached to a GCE PD
|
// Testing configurations of single a PV/PVC pair attached to a GCE PD
|
||||||
var _ = utils.SIGDescribe("PersistentVolumes GCEPD", func() {
|
var _ = utils.SIGDescribe("PersistentVolumes GCEPD [Feature:StorageProvider]", func() {
|
||||||
var (
|
var (
|
||||||
c clientset.Interface
|
c clientset.Interface
|
||||||
diskName string
|
diskName string
|
||||||
|
@ -32,7 +32,6 @@ import (
|
|||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
|
||||||
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
|
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
|
||||||
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
|
|
||||||
e2estatefulset "k8s.io/kubernetes/test/e2e/framework/statefulset"
|
e2estatefulset "k8s.io/kubernetes/test/e2e/framework/statefulset"
|
||||||
e2evolume "k8s.io/kubernetes/test/e2e/framework/volume"
|
e2evolume "k8s.io/kubernetes/test/e2e/framework/volume"
|
||||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||||
@ -330,7 +329,7 @@ var _ = utils.SIGDescribe("PersistentVolumes", func() {
|
|||||||
|
|
||||||
ginkgo.It("should be reschedulable [Slow]", func() {
|
ginkgo.It("should be reschedulable [Slow]", func() {
|
||||||
// Only run on providers with default storageclass
|
// Only run on providers with default storageclass
|
||||||
e2eskipper.SkipUnlessProviderIs("openstack", "gce", "gke", "vsphere", "azure")
|
e2epv.SkipIfNoDefaultStorageClass(c)
|
||||||
|
|
||||||
numVols := 4
|
numVols := 4
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user