From 017eaf170a4d841b156160d5c61ab28965652e9a Mon Sep 17 00:00:00 2001 From: Kenichi Omichi Date: Tue, 17 Mar 2020 18:50:03 +0000 Subject: [PATCH] Move podlogs into e2e/storage/podlogs The e2e framework package podlogs is used in e2e/storage/testsuites only. In addition we considered we should have a single e2e framework package for pod without the podlogs. So this moves the podlogs into e2e/storage/podlogs for the e2e storage tests. --- test/e2e/framework/BUILD | 1 - test/e2e/storage/BUILD | 1 + test/e2e/{framework => storage}/podlogs/BUILD | 2 +- test/e2e/{framework => storage}/podlogs/podlogs.go | 0 test/e2e/storage/testsuites/BUILD | 2 +- test/e2e/storage/testsuites/base.go | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename test/e2e/{framework => storage}/podlogs/BUILD (91%) rename test/e2e/{framework => storage}/podlogs/podlogs.go (100%) diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index 3f318db18f2..036e1748413 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -126,7 +126,6 @@ filegroup( "//test/e2e/framework/node:all-srcs", "//test/e2e/framework/perf:all-srcs", "//test/e2e/framework/pod:all-srcs", - "//test/e2e/framework/podlogs:all-srcs", "//test/e2e/framework/providers/aws:all-srcs", "//test/e2e/framework/providers/azure:all-srcs", "//test/e2e/framework/providers/gce:all-srcs", diff --git a/test/e2e/storage/BUILD b/test/e2e/storage/BUILD index fa47c0928cf..f95cbed0341 100644 --- a/test/e2e/storage/BUILD +++ b/test/e2e/storage/BUILD @@ -104,6 +104,7 @@ filegroup( ":package-srcs", "//test/e2e/storage/drivers:all-srcs", "//test/e2e/storage/external:all-srcs", + "//test/e2e/storage/podlogs:all-srcs", "//test/e2e/storage/testpatterns:all-srcs", "//test/e2e/storage/testsuites:all-srcs", "//test/e2e/storage/utils:all-srcs", diff --git a/test/e2e/framework/podlogs/BUILD b/test/e2e/storage/podlogs/BUILD similarity index 91% rename from test/e2e/framework/podlogs/BUILD rename to test/e2e/storage/podlogs/BUILD index 404f6b7a98d..c2bee4c141f 100644 --- a/test/e2e/framework/podlogs/BUILD +++ b/test/e2e/storage/podlogs/BUILD @@ -3,7 +3,7 @@ load("@io_bazel_rules_go//go:def.bzl", "go_library") go_library( name = "go_default_library", srcs = ["podlogs.go"], - importpath = "k8s.io/kubernetes/test/e2e/framework/podlogs", + importpath = "k8s.io/kubernetes/test/e2e/storage/podlogs", visibility = ["//visibility:public"], deps = [ "//staging/src/k8s.io/api/core/v1:go_default_library", diff --git a/test/e2e/framework/podlogs/podlogs.go b/test/e2e/storage/podlogs/podlogs.go similarity index 100% rename from test/e2e/framework/podlogs/podlogs.go rename to test/e2e/storage/podlogs/podlogs.go diff --git a/test/e2e/storage/testsuites/BUILD b/test/e2e/storage/testsuites/BUILD index b50d0d13682..8ae28622525 100644 --- a/test/e2e/storage/testsuites/BUILD +++ b/test/e2e/storage/testsuites/BUILD @@ -49,10 +49,10 @@ go_library( "//test/e2e/framework/metrics:go_default_library", "//test/e2e/framework/node:go_default_library", "//test/e2e/framework/pod:go_default_library", - "//test/e2e/framework/podlogs:go_default_library", "//test/e2e/framework/pv:go_default_library", "//test/e2e/framework/skipper:go_default_library", "//test/e2e/framework/volume:go_default_library", + "//test/e2e/storage/podlogs:go_default_library", "//test/e2e/storage/testpatterns:go_default_library", "//test/e2e/storage/utils:go_default_library", "//test/utils/image:go_default_library", diff --git a/test/e2e/storage/testsuites/base.go b/test/e2e/storage/testsuites/base.go index 1f619102e2a..31126a312e2 100644 --- a/test/e2e/storage/testsuites/base.go +++ b/test/e2e/storage/testsuites/base.go @@ -41,10 +41,10 @@ import ( csitrans "k8s.io/csi-translation-lib" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/metrics" - "k8s.io/kubernetes/test/e2e/framework/podlogs" e2epv "k8s.io/kubernetes/test/e2e/framework/pv" e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/framework/volume" + "k8s.io/kubernetes/test/e2e/storage/podlogs" "k8s.io/kubernetes/test/e2e/storage/testpatterns" )