Skip to content

Commit e97212f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request kubernetes#87124 from yuxiaobo96/k8s-skipper2
test/e2e/storage:Use e2eskipper package
2 parents d5145ff + 73fb0ab commit e97212f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+214
-159
lines changed

‎test/e2e/storage/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ go_library(
7373
"//test/e2e/framework/providers/gce:go_default_library",
7474
"//test/e2e/framework/pv:go_default_library",
7575
"//test/e2e/framework/rc:go_default_library",
76+
"//test/e2e/framework/skipper:go_default_library",
7677
"//test/e2e/framework/ssh:go_default_library",
7778
"//test/e2e/framework/statefulset:go_default_library",
7879
"//test/e2e/framework/testfiles:go_default_library",

‎test/e2e/storage/detach_mounted.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
"k8s.io/kubernetes/test/e2e/framework"
3030
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3131
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
32+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3233
"k8s.io/kubernetes/test/e2e/storage/utils"
3334
imageutils "k8s.io/kubernetes/test/utils/image"
3435

@@ -52,10 +53,10 @@ var _ = utils.SIGDescribe("Detaching volumes", func() {
5253
var suffix string
5354

5455
ginkgo.BeforeEach(func() {
55-
framework.SkipUnlessProviderIs("gce", "local")
56-
framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
57-
framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
58-
framework.SkipUnlessSSHKeyPresent()
56+
e2eskipper.SkipUnlessProviderIs("gce", "local")
57+
e2eskipper.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
58+
e2eskipper.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
59+
e2eskipper.SkipUnlessSSHKeyPresent()
5960

6061
cs = f.ClientSet
6162
ns = f.Namespace
@@ -66,7 +67,7 @@ var _ = utils.SIGDescribe("Detaching volumes", func() {
6667
})
6768

6869
ginkgo.It("should not work when mount is in progress [Slow]", func() {
69-
framework.SkipUnlessSSHKeyPresent()
70+
e2eskipper.SkipUnlessSSHKeyPresent()
7071

7172
driver := "attachable-with-long-mount"
7273
driverInstallAs := driver + "-" + suffix

‎test/e2e/storage/drivers/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ go_library(
2828
"//test/e2e/framework/node:go_default_library",
2929
"//test/e2e/framework/pod:go_default_library",
3030
"//test/e2e/framework/pv:go_default_library",
31+
"//test/e2e/framework/skipper:go_default_library",
3132
"//test/e2e/framework/volume:go_default_library",
3233
"//test/e2e/storage/testpatterns:go_default_library",
3334
"//test/e2e/storage/testsuites:go_default_library",

‎test/e2e/storage/drivers/csi.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ import (
5252
clientset "k8s.io/client-go/kubernetes"
5353
"k8s.io/kubernetes/test/e2e/framework"
5454
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
55+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
5556
"k8s.io/kubernetes/test/e2e/framework/volume"
5657
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
5758
"k8s.io/kubernetes/test/e2e/storage/testsuites"
@@ -134,7 +135,7 @@ func (h *hostpathCSIDriver) GetDriverInfo() *testsuites.DriverInfo {
134135

135136
func (h *hostpathCSIDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
136137
if pattern.VolType == testpatterns.CSIInlineVolume && len(h.volumeAttributes) == 0 {
137-
framework.Skipf("%s has no volume attributes defined, doesn't support ephemeral inline volumes", h.driverInfo.Name)
138+
e2eskipper.Skipf("%s has no volume attributes defined, doesn't support ephemeral inline volumes", h.driverInfo.Name)
138139
}
139140
}
140141

@@ -397,12 +398,12 @@ func (g *gcePDCSIDriver) GetDriverInfo() *testsuites.DriverInfo {
397398
}
398399

399400
func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
400-
framework.SkipUnlessProviderIs("gce", "gke")
401+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
401402
if pattern.FsType == "xfs" {
402-
framework.SkipUnlessNodeOSDistroIs("ubuntu", "custom")
403+
e2eskipper.SkipUnlessNodeOSDistroIs("ubuntu", "custom")
403404
}
404405
if pattern.FeatureTag == "[sig-windows]" {
405-
framework.Skipf("Skipping tests for windows since CSI does not support it yet")
406+
e2eskipper.Skipf("Skipping tests for windows since CSI does not support it yet")
406407
}
407408
}
408409

‎test/e2e/storage/drivers/in_tree.go‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import (
5757
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
5858
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
5959
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
60+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
6061
"k8s.io/kubernetes/test/e2e/framework/volume"
6162
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
6263
"k8s.io/kubernetes/test/e2e/storage/testsuites"
@@ -260,7 +261,7 @@ func (g *glusterFSDriver) GetDriverInfo() *testsuites.DriverInfo {
260261
}
261262

262263
func (g *glusterFSDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
263-
framework.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
264+
e2eskipper.SkipUnlessNodeOSDistroIs("gci", "ubuntu", "custom")
264265
}
265266

266267
func (g *glusterFSDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource {
@@ -1076,7 +1077,7 @@ func (c *cinderDriver) GetDriverInfo() *testsuites.DriverInfo {
10761077
}
10771078

10781079
func (c *cinderDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
1079-
framework.SkipUnlessProviderIs("openstack")
1080+
e2eskipper.SkipUnlessProviderIs("openstack")
10801081
}
10811082

10821083
func (c *cinderDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource {
@@ -1251,9 +1252,9 @@ func (g *gcePdDriver) GetDriverInfo() *testsuites.DriverInfo {
12511252
}
12521253

12531254
func (g *gcePdDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
1254-
framework.SkipUnlessProviderIs("gce", "gke")
1255+
e2eskipper.SkipUnlessProviderIs("gce", "gke")
12551256
if pattern.FeatureTag == "[sig-windows]" {
1256-
framework.SkipUnlessNodeOSDistroIs("windows")
1257+
e2eskipper.SkipUnlessNodeOSDistroIs("windows")
12571258
}
12581259
}
12591260

@@ -1379,7 +1380,7 @@ func (v *vSphereDriver) GetDriverInfo() *testsuites.DriverInfo {
13791380
}
13801381

13811382
func (v *vSphereDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
1382-
framework.SkipUnlessProviderIs("vsphere")
1383+
e2eskipper.SkipUnlessProviderIs("vsphere")
13831384
}
13841385

13851386
func (v *vSphereDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource {
@@ -1508,7 +1509,7 @@ func (a *azureDiskDriver) GetDriverInfo() *testsuites.DriverInfo {
15081509
}
15091510

15101511
func (a *azureDiskDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
1511-
framework.SkipUnlessProviderIs("azure")
1512+
e2eskipper.SkipUnlessProviderIs("azure")
15121513
}
15131514

15141515
func (a *azureDiskDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource {
@@ -1641,7 +1642,7 @@ func (a *awsDriver) GetDriverInfo() *testsuites.DriverInfo {
16411642
}
16421643

16431644
func (a *awsDriver) SkipUnsupportedTest(pattern testpatterns.TestPattern) {
1644-
framework.SkipUnlessProviderIs("aws")
1645+
e2eskipper.SkipUnlessProviderIs("aws")
16451646
}
16461647

16471648
func (a *awsDriver) GetVolumeSource(readOnly bool, fsType string, volume testsuites.TestVolume) *v1.VolumeSource {
@@ -1837,7 +1838,7 @@ func (l *localDriver) PrepareTest(f *framework.Framework) (*testsuites.PerTestCo
18371838
num, err := strconv.Atoi(strings.TrimSpace(res))
18381839
framework.ExpectNoError(err)
18391840
if num < 1 {
1840-
framework.Skipf("Requires at least 1 %s %s localSSD ", ssdInterface, filesystemType)
1841+
e2eskipper.Skipf("Requires at least 1 %s %s localSSD ", ssdInterface, filesystemType)
18411842
}
18421843
}
18431844

‎test/e2e/storage/external/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ go_library(
1515
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
1616
"//test/e2e/framework:go_default_library",
1717
"//test/e2e/framework/config:go_default_library",
18+
"//test/e2e/framework/skipper:go_default_library",
1819
"//test/e2e/framework/volume:go_default_library",
1920
"//test/e2e/storage/testpatterns:go_default_library",
2021
"//test/e2e/storage/testsuites:go_default_library",

‎test/e2e/storage/external/external.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import (
3131
"k8s.io/client-go/kubernetes/scheme"
3232
"k8s.io/kubernetes/test/e2e/framework"
3333
"k8s.io/kubernetes/test/e2e/framework/config"
34+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3435
"k8s.io/kubernetes/test/e2e/framework/volume"
3536
"k8s.io/kubernetes/test/e2e/storage/testpatterns"
3637
"k8s.io/kubernetes/test/e2e/storage/testsuites"
@@ -239,7 +240,7 @@ func (d *driverDefinition) SkipUnsupportedTest(pattern testpatterns.TestPattern)
239240
supported = len(d.InlineVolumes) != 0
240241
}
241242
if !supported {
242-
framework.Skipf("Driver %q does not support volume type %q - skipping", d.DriverInfo.Name, pattern.VolType)
243+
e2eskipper.Skipf("Driver %q does not support volume type %q - skipping", d.DriverInfo.Name, pattern.VolType)
243244
}
244245

245246
supported = false
@@ -252,7 +253,7 @@ func (d *driverDefinition) SkipUnsupportedTest(pattern testpatterns.TestPattern)
252253
}
253254
}
254255
if !supported {
255-
framework.Skipf("Driver %q does not support snapshot type %q - skipping", d.DriverInfo.Name, pattern.SnapshotType)
256+
e2eskipper.Skipf("Driver %q does not support snapshot type %q - skipping", d.DriverInfo.Name, pattern.SnapshotType)
256257
}
257258
}
258259

@@ -294,7 +295,7 @@ func (d *driverDefinition) GetDynamicProvisionStorageClass(config *testsuites.Pe
294295

295296
func (d *driverDefinition) GetSnapshotClass(config *testsuites.PerTestConfig) *unstructured.Unstructured {
296297
if !d.SnapshotClass.FromName {
297-
framework.Skipf("Driver %q does not support snapshotting - skipping", d.DriverInfo.Name)
298+
e2eskipper.Skipf("Driver %q does not support snapshotting - skipping", d.DriverInfo.Name)
298299
}
299300

300301
snapshotter := d.DriverInfo.Name
@@ -307,7 +308,7 @@ func (d *driverDefinition) GetSnapshotClass(config *testsuites.PerTestConfig) *u
307308

308309
func (d *driverDefinition) GetVolume(config *testsuites.PerTestConfig, volumeNumber int) (map[string]string, bool, bool) {
309310
if len(d.InlineVolumes) == 0 {
310-
framework.Skipf("%s does not have any InlineVolumeAttributes defined", d.DriverInfo.Name)
311+
e2eskipper.Skipf("%s does not have any InlineVolumeAttributes defined", d.DriverInfo.Name)
311312
}
312313
volume := d.InlineVolumes[volumeNumber%len(d.InlineVolumes)]
313314
return volume.Attributes, volume.Shared, volume.ReadOnly

‎test/e2e/storage/flexvolume.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import (
2929
clientset "k8s.io/client-go/kubernetes"
3030
"k8s.io/kubernetes/test/e2e/framework"
3131
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
32+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3233
e2essh "k8s.io/kubernetes/test/e2e/framework/ssh"
3334
"k8s.io/kubernetes/test/e2e/framework/testfiles"
3435
"k8s.io/kubernetes/test/e2e/framework/volume"
@@ -165,10 +166,10 @@ var _ = utils.SIGDescribe("Flexvolumes", func() {
165166
var suffix string
166167

167168
ginkgo.BeforeEach(func() {
168-
framework.SkipUnlessProviderIs("gce", "local")
169-
framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
170-
framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
171-
framework.SkipUnlessSSHKeyPresent()
169+
e2eskipper.SkipUnlessProviderIs("gce", "local")
170+
e2eskipper.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
171+
e2eskipper.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
172+
e2eskipper.SkipUnlessSSHKeyPresent()
172173

173174
cs = f.ClientSet
174175
ns = f.Namespace

‎test/e2e/storage/flexvolume_mounted_volume_resize.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ import (
3434
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3535
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3636
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
37+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3738
"k8s.io/kubernetes/test/e2e/storage/testsuites"
3839
"k8s.io/kubernetes/test/e2e/storage/utils"
3940
)
@@ -60,10 +61,10 @@ var _ = utils.SIGDescribe("Mounted flexvolume expand[Slow]", func() {
6061

6162
f := framework.NewDefaultFramework("mounted-flexvolume-expand")
6263
ginkgo.BeforeEach(func() {
63-
framework.SkipUnlessProviderIs("aws", "gce", "local")
64-
framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
65-
framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
66-
framework.SkipUnlessSSHKeyPresent()
64+
e2eskipper.SkipUnlessProviderIs("aws", "gce", "local")
65+
e2eskipper.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
66+
e2eskipper.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
67+
e2eskipper.SkipUnlessSSHKeyPresent()
6768
c = f.ClientSet
6869
ns = f.Namespace.Name
6970
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout))

‎test/e2e/storage/flexvolume_online_resize.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import (
3232
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
3333
e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
3434
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"
35+
e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper"
3536
"k8s.io/kubernetes/test/e2e/storage/testsuites"
3637
"k8s.io/kubernetes/test/e2e/storage/utils"
3738
)
@@ -53,10 +54,10 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa
5354

5455
f := framework.NewDefaultFramework("mounted-flexvolume-expand")
5556
ginkgo.BeforeEach(func() {
56-
framework.SkipUnlessProviderIs("aws", "gce", "local")
57-
framework.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
58-
framework.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
59-
framework.SkipUnlessSSHKeyPresent()
57+
e2eskipper.SkipUnlessProviderIs("aws", "gce", "local")
58+
e2eskipper.SkipUnlessMasterOSDistroIs("debian", "ubuntu", "gci", "custom")
59+
e2eskipper.SkipUnlessNodeOSDistroIs("debian", "ubuntu", "gci", "custom")
60+
e2eskipper.SkipUnlessSSHKeyPresent()
6061
c = f.ClientSet
6162
ns = f.Namespace.Name
6263
framework.ExpectNoError(framework.WaitForAllNodesSchedulable(c, framework.TestContext.NodeSchedulableTimeout))
@@ -117,7 +118,7 @@ var _ = utils.SIGDescribe("Mounted flexvolume volume expand [Slow] [Feature:Expa
117118
})
118119

119120
ginkgo.It("should be resizable when mounted", func() {
120-
framework.SkipUnlessSSHKeyPresent()
121+
e2eskipper.SkipUnlessSSHKeyPresent()
121122

122123
driver := "dummy-attachable"
123124

0 commit comments

Comments
 (0)