From 41dbdef5407852e11952595ba1149b4003b2cb02 Mon Sep 17 00:00:00 2001 From: S R Ashrith Date: Wed, 17 Aug 2022 14:43:05 +0530 Subject: [PATCH 1/2] vsphere in-tree driver test fixes --- test/e2e/storage/drivers/in_tree.go | 1 + test/e2e/storage/testsuites/multivolume.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/test/e2e/storage/drivers/in_tree.go b/test/e2e/storage/drivers/in_tree.go index 0733197e5dd..ccbc820147e 100644 --- a/test/e2e/storage/drivers/in_tree.go +++ b/test/e2e/storage/drivers/in_tree.go @@ -1253,6 +1253,7 @@ func InitVSphereDriver() storageframework.TestDriver { storageframework.CapExec: true, storageframework.CapMultiPODs: true, storageframework.CapTopology: true, + storageframework.CapBlock: true, }, }, } diff --git a/test/e2e/storage/testsuites/multivolume.go b/test/e2e/storage/testsuites/multivolume.go index 2718dc51289..2f2f33a93a2 100644 --- a/test/e2e/storage/testsuites/multivolume.go +++ b/test/e2e/storage/testsuites/multivolume.go @@ -746,7 +746,7 @@ func getCurrentTopologiesNumber(cs clientset.Interface, nodes *v1.NodeList, keys break } } - if !found { + if !found && len(topo) > 0 { framework.Logf("found topology %v", topo) topos = append(topos, topo) topoCount = append(topoCount, 1) From 16f541ea8fa213c8dcc9bb96f2daa00e539fbb43 Mon Sep 17 00:00:00 2001 From: S R Ashrith Date: Tue, 23 Aug 2022 14:54:20 +0530 Subject: [PATCH 2/2] Skip read only raw block volume test for in-tree vsphere driver --- test/e2e/storage/testsuites/multivolume.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/e2e/storage/testsuites/multivolume.go b/test/e2e/storage/testsuites/multivolume.go index 2f2f33a93a2..358bb806066 100644 --- a/test/e2e/storage/testsuites/multivolume.go +++ b/test/e2e/storage/testsuites/multivolume.go @@ -429,6 +429,10 @@ func (t *multiVolumeTestSuite) DefineTests(driver storageframework.TestDriver, p e2eskipper.Skipf("Driver %q does not support multiple concurrent pods - skipping", dInfo.Name) } + if l.driver.GetDriverInfo().Name == "vsphere" && pattern == storageframework.BlockVolModeDynamicPV { + e2eskipper.Skipf("Driver %q does not support read only raw block volumes - skipping", dInfo.Name) + } + // Create volume testVolumeSizeRange := t.GetTestSuiteInfo().SupportedSizeRange resource := storageframework.CreateVolumeResource(l.driver, l.config, pattern, testVolumeSizeRange)