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 #99701 from wojtek-t/cleanup_describe_13

Browse Source 
Tag storage windows tests with [Feature:Windows] instead of [sig-windows]
This commit is contained in:
Kubernetes Prow Robot 2021-03-05 10:00:47 -08:00 committed by GitHub
commit 42c1ccb38e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/storage/drivers/csi.go
View File

@ -757,7 +757,7 @@ func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern storageframework.TestPatter
if pattern.FsType == "xfs" { if pattern.FsType == "xfs" {
e2eskipper.SkipUnlessNodeOSDistroIs("ubuntu", "custom") e2eskipper.SkipUnlessNodeOSDistroIs("ubuntu", "custom")
} }
if pattern.FeatureTag == "[sig-windows]" { if pattern.FeatureTag == "[Feature:Windows]" {
e2eskipper.Skipf("Skipping tests for windows since CSI does not support it yet") e2eskipper.Skipf("Skipping tests for windows since CSI does not support it yet")
} }
} }

2
test/e2e/storage/drivers/in_tree.go
View File

@ -1299,7 +1299,7 @@ func (g *gcePdDriver) GetDriverInfo() *storageframework.DriverInfo {
func (g *gcePdDriver) SkipUnsupportedTest(pattern storageframework.TestPattern) { func (g *gcePdDriver) SkipUnsupportedTest(pattern storageframework.TestPattern) {
e2eskipper.SkipUnlessProviderIs("gce", "gke") e2eskipper.SkipUnlessProviderIs("gce", "gke")
if pattern.FeatureTag == "[sig-windows]" { if pattern.FeatureTag == "[Feature:Windows]" {
e2eskipper.SkipUnlessNodeOSDistroIs("windows") e2eskipper.SkipUnlessNodeOSDistroIs("windows")
} }
} }

12
test/e2e/storage/framework/testpattern.go
View File

@ -229,35 +229,35 @@ var (
Name: "Inline-volume (ntfs)", Name: "Inline-volume (ntfs)",
VolType: InlineVolume, VolType: InlineVolume,
FsType: "ntfs", FsType: "ntfs",
FeatureTag: "[sig-windows]", FeatureTag: "[Feature:Windows]",
} }
// NtfsCSIEphemeralVolume is TestPattern for "CSI Ephemeral-volume (ntfs)" // NtfsCSIEphemeralVolume is TestPattern for "CSI Ephemeral-volume (ntfs)"
NtfsCSIEphemeralVolume = TestPattern{ NtfsCSIEphemeralVolume = TestPattern{
Name: "CSI Ephemeral-volume (ntfs) [alpha]", Name: "CSI Ephemeral-volume (ntfs) [alpha]",
VolType: CSIInlineVolume, VolType: CSIInlineVolume,
FsType: "ntfs", FsType: "ntfs",
FeatureTag: "[sig-windows]", FeatureTag: "[Feature:Windows]",
} }
// NtfsGenericEphemeralVolume is TestPattern for "Generic Ephemeral-volume (ntfs)" // NtfsGenericEphemeralVolume is TestPattern for "Generic Ephemeral-volume (ntfs)"
NtfsGenericEphemeralVolume = TestPattern{ NtfsGenericEphemeralVolume = TestPattern{
Name: "Generic Ephemeral-volume (ntfs) [Feature:GenericEphemeralVolume]", Name: "Generic Ephemeral-volume (ntfs) [Feature:GenericEphemeralVolume]",
VolType: GenericEphemeralVolume, VolType: GenericEphemeralVolume,
FsType: "ntfs", FsType: "ntfs",
FeatureTag: "[sig-windows]", FeatureTag: "[Feature:Windows]",
} }
// NtfsPreprovisionedPV is TestPattern for "Pre-provisioned PV (ntfs)" // NtfsPreprovisionedPV is TestPattern for "Pre-provisioned PV (ntfs)"
NtfsPreprovisionedPV = TestPattern{ NtfsPreprovisionedPV = TestPattern{
Name: "Pre-provisioned PV (ntfs)", Name: "Pre-provisioned PV (ntfs)",
VolType: PreprovisionedPV, VolType: PreprovisionedPV,
FsType: "ntfs", FsType: "ntfs",
FeatureTag: "[sig-windows]", FeatureTag: "[Feature:Windows]",
} }
// NtfsDynamicPV is TestPattern for "Dynamic PV (ntfs)" // NtfsDynamicPV is TestPattern for "Dynamic PV (ntfs)"
NtfsDynamicPV = TestPattern{ NtfsDynamicPV = TestPattern{
Name: "Dynamic PV (ntfs)", Name: "Dynamic PV (ntfs)",
VolType: DynamicPV, VolType: DynamicPV,
FsType: "ntfs", FsType: "ntfs",
FeatureTag: "[sig-windows]", FeatureTag: "[Feature:Windows]",
SnapshotDeletionPolicy: DeleteSnapshot, SnapshotDeletionPolicy: DeleteSnapshot,
SnapshotType: DynamicCreatedSnapshot, SnapshotType: DynamicCreatedSnapshot,
} }
@ -340,7 +340,7 @@ var (
VolType: DynamicPV, VolType: DynamicPV,
AllowExpansion: true, AllowExpansion: true,
FsType: "ntfs", FsType: "ntfs",
FeatureTag: "[sig-windows]", FeatureTag: "[Feature:Windows]",
} }
// BlockVolModeDynamicPVAllowExpansion is TestPattern for "Dynamic PV (block volmode)(allowExpansion)" // BlockVolModeDynamicPVAllowExpansion is TestPattern for "Dynamic PV (block volmode)(allowExpansion)"

2
test/e2e/windows/README.md
View File

@ -11,7 +11,7 @@ export KUBE_TEST_REPO_LIST=$(pwd)/repo_list
1. Run only sig-windows tests: 1. Run only sig-windows tests:
```bash ```bash
./e2e.test --provider=local --ginkgo.noColor --ginkgo.focus="\[sig-windows\]" --node-os-distro="windows" ./e2e.test --provider=local --ginkgo.noColor --ginkgo.focus="\[sig-windows\]|\[Feature:Windows\]" --node-os-distro="windows"
``` ```