diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index 8ce92e5ef19..4e6a474e2d3 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -23,6 +23,7 @@ test/e2e/apps/deployment.go: "RecreateDeployment should delete old pods and crea test/e2e/apps/deployment.go: "deployment should delete old replica sets" test/e2e/apps/deployment.go: "deployment should support rollover" test/e2e/apps/deployment.go: "deployment should support proportional scaling" +test/e2e/apps/job.go: "should delete a job" test/e2e/apps/rc.go: "should serve a basic image on each replica with a public image" test/e2e/apps/rc.go: "should adopt matching pods on creation" test/e2e/apps/rc.go: "should release no longer matching pods" diff --git a/test/e2e/apps/job.go b/test/e2e/apps/job.go index dbb8f2ba83c..21018e24f7d 100644 --- a/test/e2e/apps/job.go +++ b/test/e2e/apps/job.go @@ -100,7 +100,12 @@ var _ = SIGDescribe("Job", func() { Expect(err).NotTo(HaveOccurred(), "failed to ensure job past active deadline in namespace: %s", f.Namespace.Name) }) - It("should delete a job", func() { + /* + Release : v1.15 + Testname: Jobs, active pods, graceful termination + Description: Create a job. Ensure the active pods reflect paralellism in the namespace and delete the job. Job MUST be deleted successfully. + */ + framework.ConformanceIt("should delete a job", func() { By("Creating a job") job := jobutil.NewTestJob("notTerminate", "foo", v1.RestartPolicyNever, parallelism, completions, nil, backoffLimit) job, err := jobutil.CreateJob(f.ClientSet, f.Namespace.Name, job)