diff --git a/test/e2e/apps/BUILD b/test/e2e/apps/BUILD index 3bf6384c050..2ee226fa512 100644 --- a/test/e2e/apps/BUILD +++ b/test/e2e/apps/BUILD @@ -14,6 +14,7 @@ go_library( "rc.go", "replica_set.go", "statefulset.go", + "ttl_after_finished.go", "types.go", "wait.go", ], @@ -33,6 +34,7 @@ go_library( "//pkg/controller/replicaset:go_default_library", "//pkg/controller/replication:go_default_library", "//pkg/scheduler/apis/config:go_default_library", + "//pkg/util/slice:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/autoscaling/v1:go_default_library", "//staging/src/k8s.io/api/batch/v1:go_default_library", diff --git a/test/e2e/node/ttlafterfinished.go b/test/e2e/apps/ttl_after_finished.go similarity index 93% rename from test/e2e/node/ttlafterfinished.go rename to test/e2e/apps/ttl_after_finished.go index 814c1e69d13..085e1a5fd68 100644 --- a/test/e2e/node/ttlafterfinished.go +++ b/test/e2e/apps/ttl_after_finished.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package node +package apps import ( "context" @@ -40,7 +40,7 @@ const ( JobTimeout = 15 * time.Minute ) -var _ = framework.KubeDescribe("[Feature:TTLAfterFinished][NodeAlphaFeature:TTLAfterFinished]", func() { +var _ = SIGDescribe("[Feature:TTLAfterFinished]", func() { f := framework.NewDefaultFramework("ttlafterfinished") ginkgo.It("job should be deleted once it finishes after TTL seconds", func() { @@ -93,9 +93,9 @@ func testFinishedJob(f *framework.Framework) { framework.Logf("Check Job's deletionTimestamp and compare with the time when the Job finished") job, err = e2ejob.GetJob(c, ns, job.Name) framework.ExpectNoError(err) - finishTime := FinishTime(job) - finishTimeUTC := finishTime.UTC() - framework.ExpectNotEqual(finishTime.IsZero(), true) + jobFinishTime := finishTime(job) + finishTimeUTC := jobFinishTime.UTC() + framework.ExpectNotEqual(jobFinishTime.IsZero(), true) deleteAtUTC := job.ObjectMeta.DeletionTimestamp.UTC() framework.ExpectNotEqual(deleteAtUTC, nil) @@ -104,8 +104,8 @@ func testFinishedJob(f *framework.Framework) { framework.ExpectEqual(deleteAtUTC.Before(expireAtUTC), false) } -// FinishTime returns finish time of the specified job. -func FinishTime(finishedJob *batchv1.Job) metav1.Time { +// finishTime returns finish time of the specified job. +func finishTime(finishedJob *batchv1.Job) metav1.Time { var finishTime metav1.Time for _, c := range finishedJob.Status.Conditions { if (c.Type == batchv1.JobComplete || c.Type == batchv1.JobFailed) && c.Status == v1.ConditionTrue { diff --git a/test/e2e/node/BUILD b/test/e2e/node/BUILD index c454c68a5ca..9ec9225e9e1 100644 --- a/test/e2e/node/BUILD +++ b/test/e2e/node/BUILD @@ -19,7 +19,6 @@ go_library( "security_context.go", "ssh.go", "taints.go", - "ttlafterfinished.go", ], importpath = "k8s.io/kubernetes/test/e2e/node", visibility = ["//visibility:public"], @@ -27,8 +26,6 @@ go_library( "//pkg/cluster/ports: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/api/node/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -45,7 +42,6 @@ go_library( "//staging/src/k8s.io/client-go/tools/cache:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/stats/v1alpha1:go_default_library", "//test/e2e/framework:go_default_library", - "//test/e2e/framework/job:go_default_library", "//test/e2e/framework/kubectl:go_default_library", "//test/e2e/framework/kubelet:go_default_library", "//test/e2e/framework/node:go_default_library",