From 67de069dd1b5a93ad2e35b2e1104ba24ea57afb0 Mon Sep 17 00:00:00 2001 From: wojtekt Date: Thu, 25 Feb 2021 20:39:10 +0100 Subject: [PATCH] Move common/volume.go test to the storage dir --- test/e2e/common/BUILD | 2 -- test/e2e/common/storage/BUILD | 3 +++ test/e2e/common/{ => storage}/volumes.go | 9 ++++----- 3 files changed, 7 insertions(+), 7 deletions(-) rename test/e2e/common/{ => storage}/volumes.go (95%) diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 0cb9f01afac..48ffda7b7fc 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -28,7 +28,6 @@ go_library( "security_context.go", "sysctl.go", "util.go", - "volumes.go", ], importpath = "k8s.io/kubernetes/test/e2e/common", deps = [ @@ -69,7 +68,6 @@ go_library( "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/rc:go_default_library", "//test/e2e/framework/skipper:go_default_library", - "//test/e2e/framework/volume:go_default_library", "//test/e2e/framework/websocket:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", diff --git a/test/e2e/common/storage/BUILD b/test/e2e/common/storage/BUILD index afdd9e3fa39..395f2a99cd7 100644 --- a/test/e2e/common/storage/BUILD +++ b/test/e2e/common/storage/BUILD @@ -14,6 +14,7 @@ go_library( "projected_secret.go", "secrets_volume.go", "util.go", + "volumes.go", ], importpath = "k8s.io/kubernetes/test/e2e/common/storage", visibility = ["//visibility:public"], @@ -25,9 +26,11 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/util/uuid:go_default_library", "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library", + "//staging/src/k8s.io/client-go/kubernetes:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/skipper:go_default_library", + "//test/e2e/framework/volume:go_default_library", "//test/utils/image:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", diff --git a/test/e2e/common/volumes.go b/test/e2e/common/storage/volumes.go similarity index 95% rename from test/e2e/common/volumes.go rename to test/e2e/common/storage/volumes.go index 28aa453f039..8b06118d73f 100644 --- a/test/e2e/common/volumes.go +++ b/test/e2e/common/storage/volumes.go @@ -40,7 +40,7 @@ limitations under the License. // GlusterFS test is duplicated from test/e2e/volumes.go. Any changes made there // should be duplicated here -package common +package storage import ( "context" @@ -56,10 +56,9 @@ import ( "github.com/onsi/ginkgo" ) -// These tests need privileged containers, which are disabled by default. Run -// tests with "--ginkgo.focus=[Feature:Volumes]" -var _ = SIGStorageDescribe("GCP Volumes", func() { - f := framework.NewDefaultFramework("gcp-volume") +// TODO(#99468): Check if these tests are still needed. +var _ = SIGDescribe("Volumes", func() { + f := framework.NewDefaultFramework("volume") // note that namespace deletion is handled by delete-namespace flag // filled in BeforeEach