Merge pull request kubernetes#83946 from jsafrane/disable-local-reconstruction

k8s-ci-robot · web-flow · commit d1188a68028e · 2019-10-16T09:36:08.000-07:00
Disable local block volume reconstruction test
diff --git a/test/e2e/storage/testsuites/disruptive.go b/test/e2e/storage/testsuites/disruptive.go
@@ -51,6 +51,7 @@ func InitDisruptiveTestSuite() TestSuite {
 		},
 	}
 }
+
 func (s *disruptiveTestSuite) getTestSuiteInfo() TestSuiteInfo {
 	return s.tsInfo
 }
@@ -145,6 +146,12 @@ func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpattern
 			if (pattern.VolMode == v1.PersistentVolumeBlock && t.runTestBlock != nil) ||
 				(pattern.VolMode == v1.PersistentVolumeFilesystem && t.runTestFile != nil) {
 				ginkgo.It(t.testItStmt, func() {
+
+					if pattern.VolMode == v1.PersistentVolumeBlock && driver.GetDriverInfo().InTreePluginName == "kubernetes.io/local-volume" {
+						// TODO: https://github.com/kubernetes/kubernetes/issues/74552
+						framework.Skipf("Local volume volume plugin does not support block volume reconstruction (#74552)")
+					}
+
 					init()
 					defer cleanup()
 

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ func InitDisruptiveTestSuite() TestSuite {`
`51`	`51`	`},`
`52`	`52`	`}`
`53`	`53`	`}`
	`54`	`+`
`54`	`55`	`func (s *disruptiveTestSuite) getTestSuiteInfo() TestSuiteInfo {`
`55`	`56`	`return s.tsInfo`
`56`	`57`	`}`
`@@ -145,6 +146,12 @@ func (s *disruptiveTestSuite) defineTests(driver TestDriver, pattern testpattern`
`145`	`146`	`if (pattern.VolMode == v1.PersistentVolumeBlock && t.runTestBlock != nil) \|\|`
`146`	`147`	`(pattern.VolMode == v1.PersistentVolumeFilesystem && t.runTestFile != nil) {`
`147`	`148`	`ginkgo.It(t.testItStmt, func() {`
	`149`	`+`
	`150`	`+ if pattern.VolMode == v1.PersistentVolumeBlock && driver.GetDriverInfo().InTreePluginName == "kubernetes.io/local-volume" {`
	`151`	`+ // TODO: https://github.com/kubernetes/kubernetes/issues/74552`
	`152`	`+ framework.Skipf("Local volume volume plugin does not support block volume reconstruction (#74552)")`
	`153`	`+ }`
	`154`	`+`
`148`	`155`	`init()`
`149`	`156`	`defer cleanup()`
`150`	`157`