From fc8b8669d1a7b5c6414c77a6bf41839683dfbb68 Mon Sep 17 00:00:00 2001 From: Jan Safranek Date: Fri, 5 Apr 2019 13:26:11 +0200 Subject: [PATCH] Don't run topology tests with GCE CSI driver on non-GCE cloud --- test/e2e/storage/BUILD | 1 + test/e2e/storage/csi_volumes.go | 2 ++ 2 files changed, 3 insertions(+) diff --git a/test/e2e/storage/BUILD b/test/e2e/storage/BUILD index ddff740acd0..0529979fe44 100644 --- a/test/e2e/storage/BUILD +++ b/test/e2e/storage/BUILD @@ -70,6 +70,7 @@ go_library( "//test/e2e/framework/providers/gce:go_default_library", "//test/e2e/framework/testfiles:go_default_library", "//test/e2e/storage/drivers:go_default_library", + "//test/e2e/storage/testpatterns:go_default_library", "//test/e2e/storage/testsuites:go_default_library", "//test/e2e/storage/utils:go_default_library", "//test/utils/image:go_default_library", diff --git a/test/e2e/storage/csi_volumes.go b/test/e2e/storage/csi_volumes.go index 6056a10067a..c50bb51b715 100644 --- a/test/e2e/storage/csi_volumes.go +++ b/test/e2e/storage/csi_volumes.go @@ -22,6 +22,7 @@ import ( clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/storage/drivers" + "k8s.io/kubernetes/test/e2e/storage/testpatterns" "k8s.io/kubernetes/test/e2e/storage/testsuites" "k8s.io/kubernetes/test/e2e/storage/utils" @@ -69,6 +70,7 @@ var _ = utils.SIGDescribe("CSI Volumes", func() { testCleanup func() ) BeforeEach(func() { + driver.SkipUnsupportedTest(testpatterns.TestPattern{}) config, testCleanup = driver.PrepareTest(f) })