Merge pull request kubernetes#95527 from mattcary/gke-xfs

k8s-ci-robot · web-flow · commit a5adff2b8904 · 2020-10-15T17:35:25.000-07:00
Enable XFS tests for recent GKE COS versions
diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go
@@ -172,7 +172,7 @@ func skipUnsupportedTest(driver TestDriver, pattern testpatterns.TestPattern) {
 	if !dInfo.SupportedFsType.Has(pattern.FsType) {
 		e2eskipper.Skipf("Driver %s doesn't support %v -- skipping", dInfo.Name, pattern.FsType)
 	}
-	if pattern.FsType == "xfs" && framework.NodeOSDistroIs("gci", "cos", "windows") {
+	if pattern.FsType == "xfs" && framework.NodeOSDistroIs("windows") {
 		e2eskipper.Skipf("Distro doesn't support xfs -- skipping")
 	}
 	if pattern.FsType == "ntfs" && !framework.NodeOSDistroIs("windows") {

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ func skipUnsupportedTest(driver TestDriver, pattern testpatterns.TestPattern) {`
`172`	`172`	`if !dInfo.SupportedFsType.Has(pattern.FsType) {`
`173`	`173`	`e2eskipper.Skipf("Driver %s doesn't support %v -- skipping", dInfo.Name, pattern.FsType)`
`174`	`174`	`}`
`175`		`- if pattern.FsType == "xfs" && framework.NodeOSDistroIs("gci", "cos", "windows") {`
	`175`	`+ if pattern.FsType == "xfs" && framework.NodeOSDistroIs("windows") {`
`176`	`176`	`e2eskipper.Skipf("Distro doesn't support xfs -- skipping")`
`177`	`177`	`}`
`178`	`178`	`if pattern.FsType == "ntfs" && !framework.NodeOSDistroIs("windows") {`