github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49507 from msau42/ubuntu-e2e

Browse Source 
Automatic merge from submit-queue

Add ubuntu to gluster and nfs tests

**What this PR does / why we need it**:
Enable gluster and nfs tests for ubuntu distro

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #50039


**Special notes for your reviewer**:

**Release note**:

/release-note-none
/sig storage
This commit is contained in:
Kubernetes Submit Queue 2017-08-02 14:31:20 -07:00 committed by GitHub
commit b8760758f8
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ import (
// These tests need privileged containers, which are disabled by default. Run // These tests need privileged containers, which are disabled by default. Run
// the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]" // the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]"
var _ = framework.KubeDescribe("GCP Volumes", func() { var _ = framework.KubeDescribe("[sig-storage] GCP Volumes", func() {
f := framework.NewDefaultFramework("gcp-volume") f := framework.NewDefaultFramework("gcp-volume")
// If 'false', the test won't clear its volumes upon completion. Useful for debugging, // If 'false', the test won't clear its volumes upon completion. Useful for debugging,
@ -64,7 +64,7 @@ var _ = framework.KubeDescribe("GCP Volumes", func() {
var c clientset.Interface var c clientset.Interface
BeforeEach(func() { BeforeEach(func() {
framework.SkipUnlessNodeOSDistroIs("gci") framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu")
namespace = f.Namespace namespace = f.Namespace
c = f.ClientSet c = f.ClientSet
@ -74,7 +74,7 @@ var _ = framework.KubeDescribe("GCP Volumes", func() {
// NFS // NFS
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("NFSv4", func() { framework.KubeDescribe("NFSv4", func() {
It("should be mountable for NFSv4 [sig-storage]", func() { It("should be mountable for NFSv4", func() {
config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{}) config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{})
defer func() { defer func() {
if clean { if clean {
@ -102,7 +102,7 @@ var _ = framework.KubeDescribe("GCP Volumes", func() {
}) })
framework.KubeDescribe("NFSv3", func() { framework.KubeDescribe("NFSv3", func() {
It("should be mountable for NFSv3 [sig-storage]", func() { It("should be mountable for NFSv3", func() {
config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{}) config, _, serverIP := framework.NewNFSServer(c, namespace.Name, []string{})
defer func() { defer func() {
if clean { if clean {
@ -132,7 +132,7 @@ var _ = framework.KubeDescribe("GCP Volumes", func() {
// Gluster // Gluster
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("GlusterFS", func() { framework.KubeDescribe("GlusterFS", func() {
It("should be mountable [sig-storage]", func() { It("should be mountable", func() {
// create gluster server and endpoints // create gluster server and endpoints
config, _, _ := framework.NewGlusterfsServer(c, namespace.Name) config, _, _ := framework.NewGlusterfsServer(c, namespace.Name)
name := config.Prefix + "-server" name := config.Prefix + "-server"

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

@ -132,7 +132,8 @@ var _ = 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") framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu")
// create gluster server and endpoints // create gluster server and endpoints
config, _, _ := framework.NewGlusterfsServer(cs, namespace.Name) config, _, _ := framework.NewGlusterfsServer(cs, namespace.Name)
name := config.Prefix + "-server" name := config.Prefix + "-server"