Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Tag storage windows tests with [Feature:Windows] instead of [sig-windows] #99701

Merged
merged 1 commit into from Mar 5, 2021
Merged

Tag storage windows tests with [Feature:Windows] instead of [sig-windows] #99701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion test/e2e/storage/drivers/csi.go
View file
Open in desktop
Expand Up @@ -503,7 +503,7 @@ func (g *gcePDCSIDriver) SkipUnsupportedTest(pattern storageframework.TestPatter
if pattern.FsType == "xfs" {
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")
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/storage/drivers/in_tree.go
View file
Open in desktop
Expand Up @@ -1299,7 +1299,7 @@ func (g *gcePdDriver) GetDriverInfo() *storageframework.DriverInfo {

func (g *gcePdDriver) SkipUnsupportedTest(pattern storageframework.TestPattern) {
e2eskipper.SkipUnlessProviderIs("gce", "gke")
if pattern.FeatureTag == "[sig-windows]" {
if pattern.FeatureTag == "[Feature:Windows]" {
e2eskipper.SkipUnlessNodeOSDistroIs("windows")
}
}
Expand Down
12 changes: 6 additions & 6 deletions test/e2e/storage/framework/testpattern.go
View file
Open in desktop
Expand Up @@ -229,35 +229,35 @@ var (
Name: "Inline-volume (ntfs)",
VolType: InlineVolume,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
FeatureTag: "[Feature:Windows]",
}
// NtfsCSIEphemeralVolume is TestPattern for "CSI Ephemeral-volume (ntfs)"
NtfsCSIEphemeralVolume = TestPattern{
Name: "CSI Ephemeral-volume (ntfs) [alpha]",
VolType: CSIInlineVolume,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
FeatureTag: "[Feature:Windows]",
}
// NtfsGenericEphemeralVolume is TestPattern for "Generic Ephemeral-volume (ntfs)"
NtfsGenericEphemeralVolume = TestPattern{
Name: "Generic Ephemeral-volume (ntfs) [Feature:GenericEphemeralVolume]",
VolType: GenericEphemeralVolume,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
FeatureTag: "[Feature:Windows]",
}
// NtfsPreprovisionedPV is TestPattern for "Pre-provisioned PV (ntfs)"
NtfsPreprovisionedPV = TestPattern{
Name: "Pre-provisioned PV (ntfs)",
VolType: PreprovisionedPV,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
FeatureTag: "[Feature:Windows]",
}
// NtfsDynamicPV is TestPattern for "Dynamic PV (ntfs)"
NtfsDynamicPV = TestPattern{
Name: "Dynamic PV (ntfs)",
VolType: DynamicPV,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
FeatureTag: "[Feature:Windows]",
SnapshotDeletionPolicy: DeleteSnapshot,
SnapshotType: DynamicCreatedSnapshot,
}
Expand Down Expand Up @@ -340,7 +340,7 @@ var (
VolType: DynamicPV,
AllowExpansion: true,
FsType: "ntfs",
FeatureTag: "[sig-windows]",
FeatureTag: "[Feature:Windows]",
}

// BlockVolModeDynamicPVAllowExpansion is TestPattern for "Dynamic PV (block volmode)(allowExpansion)"
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/windows/README.md
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@ export KUBE_TEST_REPO_LIST=$(pwd)/repo_list
1. Run only sig-windows tests:

```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"
```


Expand Down