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

Merge pull request #64767 from jsafrane/remove-volume-feature

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 64416, 63625, 60967, 64767, 64588). 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>.

Remove Feature:Volume from tests

These tests don't depend on any alpha/beta feature and they have correct `SkipUnlessProviderIs` tests so they run only on proper cloud.

/kind feature
/sig storage

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2018-06-20 07:12:27 -07:00 committed by GitHub
commit 06b3f35b7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -263,7 +263,7 @@ var _ = utils.SIGDescribe("Volumes", func() {
// (/usr/bin/nova, /usr/bin/cinder and /usr/bin/keystone) // (/usr/bin/nova, /usr/bin/cinder and /usr/bin/keystone)
// and that the usual OpenStack authentication env. variables are set // and that the usual OpenStack authentication env. variables are set
// (OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME at least). // (OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME at least).
Describe("Cinder [Feature:Volumes]", func() { Describe("Cinder", func() {
It("should be mountable", func() { It("should be mountable", func() {
framework.SkipUnlessProviderIs("openstack") framework.SkipUnlessProviderIs("openstack")
config := framework.VolumeTestConfig{ config := framework.VolumeTestConfig{
@ -438,7 +438,7 @@ var _ = utils.SIGDescribe("Volumes", func() {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// vSphere // vSphere
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
Describe("vsphere [Feature:Volumes]", func() { Describe("vsphere", func() {
It("should be mountable", func() { It("should be mountable", func() {
framework.SkipUnlessProviderIs("vsphere") framework.SkipUnlessProviderIs("vsphere")
vspheretest.Bootstrap(f) vspheretest.Bootstrap(f)
@ -485,7 +485,7 @@ var _ = utils.SIGDescribe("Volumes", func() {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// Azure Disk // Azure Disk
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
Describe("Azure Disk [Feature:Volumes]", func() { Describe("Azure Disk", func() {
It("should be mountable [Slow]", func() { It("should be mountable [Slow]", func() {
framework.SkipUnlessProviderIs("azure") framework.SkipUnlessProviderIs("azure")
config := framework.VolumeTestConfig{ config := framework.VolumeTestConfig{