Skip to content

K
k3s
Unverified Commit 66ada2a1 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #76191 from jsafrane/fix-csi-topology-cloud

Don't run topology tests with GCE CSI driver on non-GCE cloud
parents 06655abd fc8b8669
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
test/e2e/storage/BUILD
View file @ 66ada2a1
...@@ -70,6 +70,7 @@ go_library( ...@@ -70,6 +70,7 @@ go_library(
"//test/e2e/framework/providers/gce:go_default_library", "//test/e2e/framework/providers/gce:go_default_library",
"//test/e2e/framework/testfiles:go_default_library", "//test/e2e/framework/testfiles:go_default_library",
"//test/e2e/storage/drivers: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/testsuites:go_default_library",
"//test/e2e/storage/utils:go_default_library", "//test/e2e/storage/utils:go_default_library",
"//test/utils/image:go_default_library", "//test/utils/image:go_default_library",
......
test/e2e/storage/csi_volumes.go
View file @ 66ada2a1
...@@ -22,6 +22,7 @@ import ( ...@@ -22,6 +22,7 @@ import (
clientset "k8s.io/client-go/kubernetes" clientset "k8s.io/client-go/kubernetes"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/storage/drivers" "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/testsuites"
"k8s.io/kubernetes/test/e2e/storage/utils" "k8s.io/kubernetes/test/e2e/storage/utils"
...@@ -69,6 +70,7 @@ var _ = utils.SIGDescribe("CSI Volumes", func() { ...@@ -69,6 +70,7 @@ var _ = utils.SIGDescribe("CSI Volumes", func() {
testCleanup func() testCleanup func()
) )
BeforeEach(func() { BeforeEach(func() {
driver.SkipUnsupportedTest(testpatterns.TestPattern{})
config, testCleanup = driver.PrepareTest(f) config, testCleanup = driver.PrepareTest(f)
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment