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

Merge pull request #67216 from yguo0905/custom-image

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2018-08-10 18:59:11 -07:00 committed by GitHub
commit b3b3121e7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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
BeforeEach(func() {
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu")
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
namespace = f.Namespace
c = f.ClientSet

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

@ -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

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

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

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

@ -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")
})
})