github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #43682 from jeffvance/e2e-featureVolumes

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 42662, 43035, 42578, 43682)

Apply [Feature:Volumes] to subset of tests in volumes.go

**What this PR does / why we need it**:
According to [this test doc](https://github.com/kubernetes/community/blob/master/contributors/devel/e2e-tests.md#kinds-of-tests), the `[Feature:xyz]` tag indicates that the tests have a non-default requirements and should not be run in the core suite. Previously all test in _e2e/volumes.go_ were tagged `[Feature:Volumes]` but I believe only six of the tests warrant this tag: iSCSI, GlusterFS, Ceph-RBD, Ceph-FS, vSPhere, and Cinder. The remaining tests (NFS, PD, ConfigMap) do not need the `Feature:` tag.

**Special notes for your reviewer**:
I moved the `[Volume]` tags from the `It`'s to the outer `KubeDescribe` to simplify the `It` text and remove redundancy.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-03-30 11:00:36 -07:00 committed by GitHub
commit b4235038b3
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
test/e2e/volumes.go
View File

@ -381,9 +381,8 @@ func deleteCinderVolume(name string) error {
return err
}
// These tests need privileged containers, which are disabled by default. Run
// the test with "go run hack/e2e.go ... --ginkgo.focus=[Feature:Volumes]"
var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// These tests need privileged containers, which are disabled by default.
var _ = framework.KubeDescribe("Volumes [Volume]", func() {
f := framework.NewDefaultFramework("volume")
// If 'false', the test won't clear its volumes upon completion. Useful for debugging,
@ -403,7 +402,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("NFS", func() {
It("should be mountable [Volume]", func() {
It("should be mountable", func() {
config := VolumeTestConfig{
namespace: namespace.Name,
prefix: "nfs",
@ -442,8 +441,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// Gluster
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("GlusterFS", func() {
It("should be mountable [Volume]", func() {
framework.KubeDescribe("GlusterFS [Feature:Volumes]", func() {
It("should be mountable", func() {
config := VolumeTestConfig{
namespace: namespace.Name,
prefix: "gluster",
@ -527,8 +526,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// are installed on all nodes!
// Run the test with "go run hack/e2e.go ... --ginkgo.focus=iSCSI"
framework.KubeDescribe("iSCSI", func() {
It("should be mountable [Volume]", func() {
framework.KubeDescribe("iSCSI [Feature:Volumes]", func() {
It("should be mountable", func() {
config := VolumeTestConfig{
namespace: namespace.Name,
prefix: "iscsi",
@ -574,8 +573,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// Ceph RBD
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("Ceph RBD", func() {
It("should be mountable [Volume]", func() {
framework.KubeDescribe("Ceph RBD [Feature:Volumes]", func() {
It("should be mountable", func() {
config := VolumeTestConfig{
namespace: namespace.Name,
prefix: "rbd",
@ -652,8 +651,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// Ceph
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("CephFS", func() {
It("should be mountable [Volume]", func() {
framework.KubeDescribe("CephFS [Feature:Volumes]", func() {
It("should be mountable", func() {
config := VolumeTestConfig{
namespace: namespace.Name,
prefix: "cephfs",
@ -730,8 +729,8 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// and that the usual OpenStack authentication env. variables are set
// (OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME at least).
framework.KubeDescribe("Cinder", func() {
It("should be mountable [Volume]", func() {
framework.KubeDescribe("Cinder [Feature:Volumes]", func() {
It("should be mountable", func() {
framework.SkipUnlessProviderIs("openstack")
config := VolumeTestConfig{
namespace: namespace.Name,
@ -807,7 +806,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("PD", func() {
It("should be mountable [Volume]", func() {
It("should be mountable", func() {
framework.SkipUnlessProviderIs("gce", "gke")
config := VolumeTestConfig{
namespace: namespace.Name,
@ -857,7 +856,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("ConfigMap", func() {
It("should be mountable [Volume]", func() {
It("should be mountable", func() {
config := VolumeTestConfig{
namespace: namespace.Name,
prefix: "configmap",
@ -934,7 +933,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() {
// vSphere
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("vsphere", func() {
framework.KubeDescribe("vsphere [Feature:Volumes]", func() {
It("should be mountable", func() {
framework.SkipUnlessProviderIs("vsphere")
var (