diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index c76f52549f6..d4241b5dc9e 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -26,6 +26,7 @@ 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/job.go: "should adopt matching orphans and release non-matching pods" test/e2e/apps/rc.go: "should serve a basic image on each replica with a public image" test/e2e/apps/rc.go: "should surface a failure condition on a common issue like exceeded quota" test/e2e/apps/rc.go: "should adopt matching pods on creation" diff --git a/test/e2e/apps/job.go b/test/e2e/apps/job.go index afdfd59916a..d1185f31de0 100644 --- a/test/e2e/apps/job.go +++ b/test/e2e/apps/job.go @@ -158,7 +158,14 @@ var _ = SIGDescribe("Job", func() { gomega.Expect(errors.IsNotFound(err)).To(gomega.BeTrue()) }) - ginkgo.It("should adopt matching orphans and release non-matching pods", func() { + /* + Release : v1.16 + Testname: Jobs, orphan pods, re-adoption + Description: Create a parallel job. The number of Pods MUST equal the level of parallelism. + Orphan a Pod by modifying its owner reference. The Job MUST re-adopt the orphan pod. + Modify the labels of one of the Job's Pods. The Job MUST release the Pod. + */ + framework.ConformanceIt("should adopt matching orphans and release non-matching pods", func() { ginkgo.By("Creating a job") job := jobutil.NewTestJob("notTerminate", "adopt-release", v1.RestartPolicyNever, parallelism, completions, nil, backoffLimit) // Replace job with the one returned from Create() so it has the UID.