github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 18:24:07 +00:00
Code Issues Projects Releases Wiki Activity

Allow running various storage e2e tests on custom images

Browse Source
This commit is contained in:
Yang Guo 2018-08-09 15:09:10 -07:00
parent facc84752b
commit 7a0c1ab322
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/common/volumes.go
View File

@ -62,7 +62,7 @@ var _ = Describe("[sig-storage] GCP Volumes", func() {
var c clientset.Interface var c clientset.Interface
BeforeEach(func() { BeforeEach(func() {
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
namespace = f.Namespace namespace = f.Namespace
c = f.ClientSet c = f.ClientSet

4
test/e2e/storage/flexvolume.go
View File

@ -204,8 +204,8 @@ var _ = utils.SIGDescribe("Flexvolumes", func() {
BeforeEach(func() { BeforeEach(func() {
framework.SkipUnlessProviderIs("gce", "local") framework.SkipUnlessProviderIs("gce", "local")
framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci") framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci") framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
framework.SkipUnlessSSHKeyPresent() framework.SkipUnlessSSHKeyPresent()
cs = f.ClientSet cs = f.ClientSet

2
test/e2e/storage/subpath.go
View File

@ -1003,7 +1003,7 @@ type glusterSource struct {
} }
func initGluster() volSource { func initGluster() volSource {
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
return &glusterSource{} return &glusterSource{}
} }

4
test/e2e/storage/volumes.go
View File

@ -128,7 +128,7 @@ var _ = utils.SIGDescribe("Volumes", func() {
Describe("GlusterFS", func() { Describe("GlusterFS", func() {
It("should be mountable", func() { It("should be mountable", func() {
//TODO (copejon) GFS is not supported on debian image. //TODO (copejon) GFS is not supported on debian image.
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
// create gluster server and endpoints // create gluster server and endpoints
config, _, _ := framework.NewGlusterfsServer(cs, namespace.Name) config, _, _ := framework.NewGlusterfsServer(cs, namespace.Name)
@ -357,7 +357,7 @@ var _ = utils.SIGDescribe("Volumes", func() {
It("should be mountable with xfs", func() { It("should be mountable with xfs", func() {
// xfs is not supported on gci // xfs is not supported on gci
// and not installed by default on debian // and not installed by default on debian
framework.SkipUnlessNodeOSDistroIs("ubuntu") framework.SkipUnlessNodeOSDistroIs("ubuntu", "custom")
testGCEPD(f, config, cs, "xfs") testGCEPD(f, config, cs, "xfs")
}) })
}) })