Merge pull request kubernetes-sigs#1905 from amacaskill/fix-vac-managed

k8s-ci-robot · web-flow · commit f299c4dda4ba · 2025-01-14T14:26:33.000-08:00
Prevent VAC tests from running on GKE managed testgrid
diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go
@@ -688,8 +688,8 @@ func generateGKETestSkip(testParams *testParameters) string {
 		skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
 	}
 
-	// VolumeAttributesClasses were promoted to beta in 1.31
-	if curVer.lessThan(mustParseVersion("1.31.0")) {
+	// VolumeAttributesClasses were promoted to beta in 1.31, but is not supported on managed driver.
+	if curVer.lessThan(mustParseVersion("1.31.0")) || testParams.useGKEManagedDriver {
 		skipString = skipString + "|VolumeAttributesClass"
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -688,8 +688,8 @@ func generateGKETestSkip(testParams *testParameters) string {`
`688`	`688`	`skipString = skipString + "\|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"`
`689`	`689`	`}`
`690`	`690`
`691`		`- // VolumeAttributesClasses were promoted to beta in 1.31`
`692`		`- if curVer.lessThan(mustParseVersion("1.31.0")) {`
	`691`	`+ // VolumeAttributesClasses were promoted to beta in 1.31, but is not supported on managed driver.`
	`692`	`+ if curVer.lessThan(mustParseVersion("1.31.0")) \|\| testParams.useGKEManagedDriver {`
`693`	`693`	`skipString = skipString + "\|VolumeAttributesClass"`
`694`	`694`	`}`
`695`	`695`