diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index 040e119a216..4f4ee5a8d85 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -38,7 +38,6 @@ go_library( "secrets_volume.go", "security_context.go", "sysctl.go", - "ttlafterfinished.go", "util.go", "volumes.go", ], @@ -54,9 +53,7 @@ go_library( "//pkg/kubelet/images:go_default_library", "//pkg/kubelet/sysctl:go_default_library", "//pkg/security/apparmor:go_default_library", - "//pkg/util/slice:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", - "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/coordination/v1beta1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD index d5eaeb127db..c841fea21d0 100644 --- a/test/e2e/node/BUILD +++ b/test/e2e/node/BUILD @@ -16,6 +16,7 @@ go_library( "runtimeclass.go", "security_context.go", "ssh.go", + "ttlafterfinished.go", ], importpath = "k8s.io/kubernetes/test/e2e/node", visibility = ["//visibility:public"], @@ -23,6 +24,8 @@ go_library( "//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/events:go_default_library", "//pkg/kubelet/runtimeclass/testing:go_default_library", + "//pkg/util/slice:go_default_library", + "//staging/src/k8s.io/api/batch/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/resource:go_default_library", diff --git a/test/e2e/common/ttlafterfinished.go b/test/e2e/node/ttlafterfinished.go similarity index 92% rename from test/e2e/common/ttlafterfinished.go rename to test/e2e/node/ttlafterfinished.go index 24c4694e982..56b8d9900ec 100644 --- a/test/e2e/common/ttlafterfinished.go +++ b/test/e2e/node/ttlafterfinished.go @@ -14,10 +14,9 @@ See the License for the specific language governing permissions and limitations under the License. */ -package common +package node import ( - "fmt" "time" batch "k8s.io/api/batch/v1" @@ -32,11 +31,10 @@ import ( const dummyFinalizer = "k8s.io/dummy-finalizer" -var _ = framework.KubeDescribe("TTLAfterFinished", func() { +var _ = framework.KubeDescribe("[Feature:TTLAfterFinished][NodeAlphaFeature:TTLAfterFinished]", func() { f := framework.NewDefaultFramework("ttlafterfinished") - alphaFeatureStr := "[Feature:TTLAfterFinished]" - It(fmt.Sprintf("Job should be deleted once it finishes after TTL seconds %s", alphaFeatureStr), func() { + It("job should be deleted once it finishes after TTL seconds", func() { testFinishedJob(f) }) })