From 7a0c1ab32294c9bad583b5b3df8dec616a9d1e01 Mon Sep 17 00:00:00 2001 From: Yang Guo Date: Thu, 9 Aug 2018 15:09:10 -0700 Subject: [PATCH] Allow running various storage e2e tests on custom images --- test/e2e/common/volumes.go | 2 +- test/e2e/storage/flexvolume.go | 4 ++-- test/e2e/storage/subpath.go | 2 +- test/e2e/storage/volumes.go | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/e2e/common/volumes.go b/test/e2e/common/volumes.go index 24a9752b265..e6df9b5a0a7 100644 --- a/test/e2e/common/volumes.go +++ b/test/e2e/common/volumes.go @@ -62,7 +62,7 @@ var _ = Describe("[sig-storage] GCP Volumes", func() { var c clientset.Interface BeforeEach(func() { - framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") + framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom") namespace = f.Namespace c = f.ClientSet diff --git a/test/e2e/storage/flexvolume.go b/test/e2e/storage/flexvolume.go index 3eed7219938..afda29bf105 100644 --- a/test/e2e/storage/flexvolume.go +++ b/test/e2e/storage/flexvolume.go @@ -204,8 +204,8 @@ var _ = utils.SIGDescribe("Flexvolumes", func() { BeforeEach(func() { framework.SkipUnlessProviderIs("gce", "local") - framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci") - framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci") + framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom") + framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom") framework.SkipUnlessSSHKeyPresent() cs = f.ClientSet diff --git a/test/e2e/storage/subpath.go b/test/e2e/storage/subpath.go index db3ca5ff452..e6e630a7ff1 100644 --- a/test/e2e/storage/subpath.go +++ b/test/e2e/storage/subpath.go @@ -1003,7 +1003,7 @@ type glusterSource struct { } func initGluster() volSource { - framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") + framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom") return &glusterSource{} } diff --git a/test/e2e/storage/volumes.go b/test/e2e/storage/volumes.go index f06b6a76279..1dae5342fd3 100644 --- a/test/e2e/storage/volumes.go +++ b/test/e2e/storage/volumes.go @@ -128,7 +128,7 @@ var _ = utils.SIGDescribe("Volumes", func() { Describe("GlusterFS", func() { It("should be mountable", func() { //TODO (copejon) GFS is not supported on debian image. - framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu") + framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom") // create gluster server and endpoints config, _, _ := framework.NewGlusterfsServer(cs, namespace.Name) @@ -357,7 +357,7 @@ var _ = utils.SIGDescribe("Volumes", func() { It("should be mountable with xfs", func() { // xfs is not supported on gci // and not installed by default on debian - framework.SkipUnlessNodeOSDistroIs("ubuntu") + framework.SkipUnlessNodeOSDistroIs("ubuntu", "custom") testGCEPD(f, config, cs, "xfs") }) })