Skip to content

Commit f06e16e

Browse files
committed
Skip snapshot and restore test because test fix (#972) is not backported to 1.8-. The fix is only in 1.9+.
1 parent c9ec498 commit f06e16e

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

test/k8s-integration/main.go

+10
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,11 @@ func generateGCETestSkip(testParams *testParameters) string {
581581
skipString = skipString + "|\\[LinuxOnly\\]"
582582
}
583583

584+
// Snapshot and restore test fixes were introduced after 1.26.
585+
if v.LessThan(apimachineryversion.MustParseSemantic("1.26.0")) {
586+
skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
587+
}
588+
584589
return skipString
585590
}
586591

@@ -598,6 +603,11 @@ func generateGKETestSkip(testParams *testParameters) string {
598603
skipString = skipString + "|pvc.data.source"
599604
}
600605

606+
// Snapshot and restore test fixes were introduced after 1.26.
607+
if curVer.lessThan(mustParseVersion("1.26.0")) || (nodeVer != nil && nodeVer.lessThan(mustParseVersion("1.26.0"))) {
608+
skipString = skipString + "|should.provision.correct.filesystem.size.when.restoring.snapshot.to.larger.size.pvc"
609+
}
610+
601611
// "volumeMode should not mount / map unused volumes in a pod" tests a
602612
// (https://github.com/kubernetes/kubernetes/pull/81163)
603613
// bug-fix introduced in 1.16

0 commit comments

Comments
 (0)