Skip to content

K
k3s
Unverified Commit b3b3121e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #67216 from yguo0905/custom-image

Automatic merge from submit-queue (batch tested with PRs 66984, 67236, 67216, 62721, 67106). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Allow running various storage e2e tests on custom images Ubuntu image is treated as custom image in some e2e tests. We whitelist both ubuntu and custom to run the storage tests. **Release note**: ```release-note None ``` /assign @msau42 /release-note-none /sig storage
parents d427a238 7a0c1ab3
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
test/e2e/common/volumes.go
View file @ b3b3121e
......@@ -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
......
test/e2e/storage/flexvolume.go
View file @ b3b3121e
......@@ -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
......
test/e2e/storage/subpath.go
View file @ b3b3121e
......@@ -1003,7 +1003,7 @@ type glusterSource struct {
}
func initGluster() volSource {
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu")
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
return &glusterSource{}
}
......
test/e2e/storage/volumes.go
View file @ b3b3121e
......@@ -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")
})
})
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment