Make storage e2e tests start with [sig-storage] instead of [k8s.io].

This makes understanding sig ownership from a test name very easy for
tools and humans.
This commit is contained in:
Ryan Hitchman 2017-07-11 14:55:45 -07:00
parent 8c52c8f15c
commit d4dc49ba90
17 changed files with 55 additions and 31 deletions

View File

@ -10,6 +10,7 @@ load(
go_library(
name = "go_default_library",
srcs = [
"framework.go",
"pd.go",
"persistent_volumes.go",
"persistent_volumes-disruptive.go",

View File

@ -0,0 +1,23 @@
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package storage
import "github.com/onsi/ginkgo"
func SIGDescribe(text string, body func()) bool {
return ginkgo.Describe("[sig-storage] "+text, body)
}

View File

@ -48,7 +48,7 @@ const (
maxReadRetry = 3
)
var _ = framework.KubeDescribe("Pod Disks", func() {
var _ = SIGDescribe("Pod Disks", func() {
var (
podClient v1core.PodInterface
nodeClient v1core.NodeInterface

View File

@ -46,7 +46,7 @@ const (
kRestart kubeletOpt = "restart"
)
var _ = framework.KubeDescribe("PersistentVolumes [Volume][Disruptive][Flaky]", func() {
var _ = SIGDescribe("PersistentVolumes [Volume][Disruptive][Flaky]", func() {
f := framework.NewDefaultFramework("disruptive-pv")
var (

View File

@ -51,7 +51,7 @@ func initializeGCETestSpec(c clientset.Interface, ns string, pvConfig framework.
}
// Testing configurations of single a PV/PVC pair attached to a GCE PD
var _ = framework.KubeDescribe("PersistentVolumes:GCEPD [Volume]", func() {
var _ = SIGDescribe("PersistentVolumes:GCEPD [Volume]", func() {
var (
c clientset.Interface
diskName string

View File

@ -58,7 +58,7 @@ const (
testSC = "local-test-storagclass"
)
var _ = framework.KubeDescribe("[Volume] PersistentVolumes-local [Feature:LocalPersistentVolumes] [Serial]", func() {
var _ = SIGDescribe("[Volume] PersistentVolumes-local [Feature:LocalPersistentVolumes] [Serial]", func() {
f := framework.NewDefaultFramework("persistent-local-volumes-test")
var (

View File

@ -31,7 +31,7 @@ import (
)
// Testing configurations of single a PV/PVC pair attached to a vSphere Disk
var _ = framework.KubeDescribe("PersistentVolumes:vsphere", func() {
var _ = SIGDescribe("PersistentVolumes:vsphere", func() {
var (
c clientset.Interface
ns string

View File

@ -97,7 +97,7 @@ func initNFSserverPod(c clientset.Interface, ns string) *v1.Pod {
})
}
var _ = framework.KubeDescribe("PersistentVolumes", func() {
var _ = SIGDescribe("PersistentVolumes", func() {
// global vars for the Context()s and It()'s below
f := framework.NewDefaultFramework("pv")
@ -123,7 +123,7 @@ var _ = framework.KubeDescribe("PersistentVolumes", func() {
// Testing configurations of a single a PV/PVC pair, multiple evenly paired PVs/PVCs,
// and multiple unevenly paired PV/PVCs
framework.KubeDescribe("PersistentVolumes:NFS", func() {
SIGDescribe("PersistentVolumes:NFS", func() {
var (
nfsServerPod *v1.Pod

View File

@ -30,7 +30,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
)
var _ = framework.KubeDescribe("PersistentVolumes [Feature:ReclaimPolicy]", func() {
var _ = SIGDescribe("PersistentVolumes [Feature:ReclaimPolicy]", func() {
f := framework.NewDefaultFramework("persistentvolumereclaim")
var (
c clientset.Interface
@ -46,7 +46,7 @@ var _ = framework.KubeDescribe("PersistentVolumes [Feature:ReclaimPolicy]", func
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout))
})
framework.KubeDescribe("persistentvolumereclaim:vsphere", func() {
SIGDescribe("persistentvolumereclaim:vsphere", func() {
BeforeEach(func() {
framework.SkipUnlessProviderIs("vsphere")
pv = nil

View File

@ -44,7 +44,7 @@ import (
9. delete pvc_vvol
*/
var _ = framework.KubeDescribe("PersistentVolumes [Feature:LabelSelector]", func() {
var _ = SIGDescribe("PersistentVolumes [Feature:LabelSelector]", func() {
f := framework.NewDefaultFramework("pvclabelselector")
var (
c clientset.Interface
@ -69,7 +69,7 @@ var _ = framework.KubeDescribe("PersistentVolumes [Feature:LabelSelector]", func
})
framework.KubeDescribe("Selector-Label Volume Binding:vsphere", func() {
SIGDescribe("Selector-Label Volume Binding:vsphere", func() {
AfterEach(func() {
By("Running clean up actions")
if framework.ProviderIs("vsphere") {

View File

@ -211,7 +211,7 @@ func checkGCEPD(volume *v1.PersistentVolume, volumeType string) error {
return nil
}
var _ = framework.KubeDescribe("Dynamic Provisioning", func() {
var _ = SIGDescribe("Dynamic Provisioning", func() {
f := framework.NewDefaultFramework("volume-provisioning")
// filled in BeforeEach
@ -223,7 +223,7 @@ var _ = framework.KubeDescribe("Dynamic Provisioning", func() {
ns = f.Namespace.Name
})
framework.KubeDescribe("DynamicProvisioner", func() {
SIGDescribe("DynamicProvisioner", func() {
It("should provision storage with different parameters [Slow] [Volume]", func() {
cloudZone := getRandomCloudZone(c)
@ -517,7 +517,7 @@ var _ = framework.KubeDescribe("Dynamic Provisioning", func() {
})
})
framework.KubeDescribe("DynamicProvisioner External", func() {
SIGDescribe("DynamicProvisioner External", func() {
It("should let an external dynamic provisioner create and delete persistent volumes [Slow] [Volume]", func() {
// external dynamic provisioner pods need additional permissions provided by the
// persistent-volume-provisioner role
@ -555,7 +555,7 @@ var _ = framework.KubeDescribe("Dynamic Provisioning", func() {
})
})
framework.KubeDescribe("DynamicProvisioner Default", func() {
SIGDescribe("DynamicProvisioner Default", func() {
It("should create and delete default persistent volumes [Slow] [Volume]", func() {
framework.SkipUnlessProviderIs("openstack", "gce", "aws", "gke", "vsphere", "azure")

View File

@ -79,7 +79,7 @@ func DeleteCinderVolume(name string) error {
}
// These tests need privileged containers, which are disabled by default.
var _ = framework.KubeDescribe("Volumes [Volume]", func() {
var _ = SIGDescribe("Volumes [Volume]", func() {
f := framework.NewDefaultFramework("volume")
// If 'false', the test won't clear its volumes upon completion. Useful for debugging,
@ -98,7 +98,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// NFS
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("NFS", func() {
SIGDescribe("NFS", func() {
It("should be mountable", func() {
config := framework.VolumeTestConfig{
Namespace: namespace.Name,
@ -138,7 +138,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// Gluster
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("GlusterFS [Feature:Volumes]", func() {
SIGDescribe("GlusterFS [Feature:Volumes]", func() {
It("should be mountable", func() {
//TODO (copejon) GFS is not supported on debian image.
framework.SkipUnlessNodeOSDistroIs("gci")
@ -226,7 +226,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// are installed on all nodes!
// Run the test with "go run hack/e2e.go ... --ginkgo.focus=iSCSI"
framework.KubeDescribe("iSCSI [Feature:Volumes]", func() {
SIGDescribe("iSCSI [Feature:Volumes]", func() {
It("should be mountable", func() {
config := framework.VolumeTestConfig{
Namespace: namespace.Name,
@ -273,7 +273,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// Ceph RBD
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("Ceph RBD [Feature:Volumes]", func() {
SIGDescribe("Ceph RBD [Feature:Volumes]", func() {
It("should be mountable", func() {
config := framework.VolumeTestConfig{
Namespace: namespace.Name,
@ -351,7 +351,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// Ceph
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("CephFS [Feature:Volumes]", func() {
SIGDescribe("CephFS [Feature:Volumes]", func() {
It("should be mountable", func() {
config := framework.VolumeTestConfig{
Namespace: namespace.Name,
@ -429,7 +429,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// and that the usual OpenStack authentication env. variables are set
// (OS_USERNAME, OS_PASSWORD, OS_TENANT_NAME at least).
framework.KubeDescribe("Cinder [Feature:Volumes]", func() {
SIGDescribe("Cinder [Feature:Volumes]", func() {
It("should be mountable", func() {
framework.SkipUnlessProviderIs("openstack")
config := framework.VolumeTestConfig{
@ -505,7 +505,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// GCE PD
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("PD", func() {
SIGDescribe("PD", func() {
// Flaky issue: #43977
It("should be mountable [Flaky]", func() {
framework.SkipUnlessProviderIs("gce", "gke")
@ -559,7 +559,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// ConfigMap
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("ConfigMap", func() {
SIGDescribe("ConfigMap", func() {
It("should be mountable", func() {
config := framework.VolumeTestConfig{
Namespace: namespace.Name,
@ -637,7 +637,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
// vSphere
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("vsphere [Feature:Volumes]", func() {
SIGDescribe("vsphere [Feature:Volumes]", func() {
It("should be mountable", func() {
framework.SkipUnlessProviderIs("vsphere")
var (
@ -689,7 +689,7 @@ var _ = framework.KubeDescribe("Volumes [Volume]", func() {
////////////////////////////////////////////////////////////////////////
// Azure Disk
////////////////////////////////////////////////////////////////////////
framework.KubeDescribe("Azure Disk [Feature:Volumes]", func() {
SIGDescribe("Azure Disk [Feature:Volumes]", func() {
It("should be mountable [Slow]", func() {
framework.SkipUnlessProviderIs("azure")
config := framework.VolumeTestConfig{

View File

@ -52,7 +52,7 @@ import (
11. Delete PVC, PV and Storage Class
*/
var _ = framework.KubeDescribe("Volume Disk Format [Volumes]", func() {
var _ = SIGDescribe("Volume Disk Format [Volumes]", func() {
f := framework.NewDefaultFramework("volume-disk-format")
var (
client clientset.Interface

View File

@ -45,7 +45,7 @@ import (
9. Delete PVC, PV and Storage Class.
*/
var _ = framework.KubeDescribe("vsphere Volume fstype [Volume]", func() {
var _ = SIGDescribe("vsphere Volume fstype [Volume]", func() {
f := framework.NewDefaultFramework("volume-fstype")
var (
client clientset.Interface

View File

@ -47,7 +47,7 @@ import (
10. Delete storage class.
*/
var _ = framework.KubeDescribe("vsphere volume operations storm [Volume]", func() {
var _ = SIGDescribe("vsphere volume operations storm [Volume]", func() {
f := framework.NewDefaultFramework("volume-ops-storm")
const DEFAULT_VOLUME_OPS_SCALE = 30
var (

View File

@ -32,7 +32,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework"
)
var _ = framework.KubeDescribe("Volume Placement [Volume]", func() {
var _ = SIGDescribe("Volume Placement [Volume]", func() {
f := framework.NewDefaultFramework("volume-placement")
var (
c clientset.Interface

View File

@ -83,7 +83,7 @@ const (
8. Delete PVC, PV and Storage Class
*/
var _ = framework.KubeDescribe("vSphere Storage policy support for dynamic provisioning [Volume]", func() {
var _ = SIGDescribe("vSphere Storage policy support for dynamic provisioning [Volume]", func() {
f := framework.NewDefaultFramework("volume-vsan-policy")
var (
client clientset.Interface