Skip snapshot and restore test because test fix (#972) is not backported to 1.8-. The fix is only in 1.9+.

amacaskill · amacaskill · commit b887a1f57d3d · 2023-04-14T19:10:08.000Z
diff --git a/test/k8s-integration/main.go b/test/k8s-integration/main.go
@@ -581,6 +581,9 @@ func generateGCETestSkip(testParams *testParameters) string {
 		skipString = skipString + "|\\[LinuxOnly\\]"
 	}
 
+	// Snapshot and restore test fixes which is added in driver version 1.9+.
+	skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
+
 	return skipString
 }
 
@@ -598,6 +601,9 @@ func generateGKETestSkip(testParams *testParameters) string {
 		skipString = skipString + "|pvc.data.source"
 	}
 
+	// Snapshot and restore test fixes which is added in driver version 1.9+.
+	skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
+
 	// "volumeMode should not mount / map unused volumes in a pod" tests a
 	// (https://github.com/kubernetes/kubernetes/pull/81163)
 	// bug-fix introduced in 1.16

Original file line number	Diff line number	Diff line change
`@@ -581,6 +581,9 @@ func generateGCETestSkip(testParams *testParameters) string {`
`581`	`581`	`skipString = skipString + "\|\\[LinuxOnly\\]"`
`582`	`582`	`}`
`583`	`583`
	`584`	`+ // Snapshot and restore test fixes which is added in driver version 1.9+.`
	`585`	`+ skipString = skipString + "\|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"`
	`586`	`+`
`584`	`587`	`return skipString`
`585`	`588`	`}`
`586`	`589`
`@@ -598,6 +601,9 @@ func generateGKETestSkip(testParams *testParameters) string {`
`598`	`601`	`skipString = skipString + "\|pvc.data.source"`
`599`	`602`	`}`
`600`	`603`
	`604`	`+ // Snapshot and restore test fixes which is added in driver version 1.9+.`
	`605`	`+ skipString = skipString + "\|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"`
	`606`	`+`
`601`	`607`	`// "volumeMode should not mount / map unused volumes in a pod" tests a`
`602`	`608`	`// (https://github.com/kubernetes/kubernetes/pull/81163)`
`603`	`609`	`// bug-fix introduced in 1.16`