github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

add failedJobsHistoryLimit to successfulJobsHistoryLimit test

Browse Source
This commit is contained in:
toyoda 2019-06-04 14:01:28 +09:00
parent b4ccb62c39
commit 6ce0d547e5
1 changed files with 54 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
test/e2e/apps/cronjob.go
View File

@ -230,80 +230,66 @@ var _ = SIGDescribe("CronJob", func() {
framework.ExpectNoError(err, "Failed to remove %s cronjob in namespace %s", cronJob.Name, f.Namespace.Name) framework.ExpectNoError(err, "Failed to remove %s cronjob in namespace %s", cronJob.Name, f.Namespace.Name)
}) })
// cleanup of successful finished jobs, with limit of one successful job // cleanup of successful/failed finished jobs, with successfulJobsHistoryLimit and failedJobsHistoryLimit
ginkgo.It("should delete successful finished jobs with limit of one successful job", func() { ginkgo.It("should delete successful/failed finished jobs with limit of one job", func() {
ginkgo.By("Creating a AllowConcurrent cronjob with custom history limits")
successLimit := int32(1)
cronJob := newTestCronJob("concurrent-limit", "*/1 * * * ?", batchv1beta1.AllowConcurrent,
successCommand, &successLimit, nil)
cronJob, err := createCronJob(f.ClientSet, f.Namespace.Name, cronJob)
framework.ExpectNoError(err, "Failed to create allowconcurrent cronjob with custom history limits in namespace %s", f.Namespace.Name)
// Job is going to complete instantly: do not check for an active job testCases := []struct {
// as we are most likely to miss it description string
command []string
successLimit int32
failedLimit int32
}{
{
description: "successful-jobs-history-limit",
command: successCommand,
successLimit: 1, // keep one successful job
failedLimit: 0, // keep none failed job
},
{
description: "failed-jobs-history-limit",
command: failureCommand,
successLimit: 0, // keep none succcessful job
failedLimit: 1, // keep one failed job
},
}
ginkgo.By("Ensuring a finished job exists") for _, t := range testCases {
err = waitForAnyFinishedJob(f.ClientSet, f.Namespace.Name) ginkgo.By(fmt.Sprintf("Creating a AllowConcurrent cronjob with custom %s", t.description))
framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists in namespace %s", f.Namespace.Name) cronJob := newTestCronJob(t.description, "*/1 * * * ?", batchv1beta1.AllowConcurrent,
t.command, &t.successLimit, &t.failedLimit)
cronJob, err := createCronJob(f.ClientSet, f.Namespace.Name, cronJob)
framework.ExpectNoError(err, "Failed to create allowconcurrent cronjob with custom history limits in namespace %s", f.Namespace.Name)
ginkgo.By("Ensuring a finished job exists by listing jobs explicitly") // Job is going to complete instantly: do not check for an active job
jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) // as we are most likely to miss it
framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists by listing jobs explicitly in namespace %s", f.Namespace.Name)
_, finishedJobs := filterActiveJobs(jobs)
framework.ExpectEqual(len(finishedJobs), 1)
// Job should get deleted when the next job finishes the next minute ginkgo.By("Ensuring a finished job exists")
ginkgo.By("Ensuring this job and its pods does not exist anymore") err = waitForAnyFinishedJob(f.ClientSet, f.Namespace.Name)
err = waitForJobToDisappear(f.ClientSet, f.Namespace.Name, finishedJobs[0]) framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists in namespace %s", f.Namespace.Name)
framework.ExpectNoError(err, "Failed to ensure that job does not exists anymore in namespace %s", f.Namespace.Name)
err = waitForJobsPodToDisappear(f.ClientSet, f.Namespace.Name, finishedJobs[0])
framework.ExpectNoError(err, "Failed to ensure that pods for job does not exists anymore in namespace %s", f.Namespace.Name)
ginkgo.By("Ensuring there is 1 finished job by listing jobs explicitly") ginkgo.By("Ensuring a finished job exists by listing jobs explicitly")
jobs, err = f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{}) jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{})
framework.ExpectNoError(err, "Failed to ensure there is one finished job by listing job explicitly in namespace %s", f.Namespace.Name) framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists by listing jobs explicitly in namespace %s", f.Namespace.Name)
_, finishedJobs = filterActiveJobs(jobs) _, finishedJobs := filterActiveJobs(jobs)
framework.ExpectEqual(len(finishedJobs), 1) framework.ExpectEqual(len(finishedJobs), 1)
ginkgo.By("Removing cronjob") // Job should get deleted when the next job finishes the next minute
err = deleteCronJob(f.ClientSet, f.Namespace.Name, cronJob.Name) ginkgo.By("Ensuring this job and its pods does not exist anymore")
framework.ExpectNoError(err, "Failed to remove the %s cronjob in namespace %s", cronJob.Name, f.Namespace.Name) err = waitForJobToDisappear(f.ClientSet, f.Namespace.Name, finishedJobs[0])
}) framework.ExpectNoError(err, "Failed to ensure that job does not exists anymore in namespace %s", f.Namespace.Name)
err = waitForJobsPodToDisappear(f.ClientSet, f.Namespace.Name, finishedJobs[0])
framework.ExpectNoError(err, "Failed to ensure that pods for job does not exists anymore in namespace %s", f.Namespace.Name)
// cleanup of failed finished jobs, with limit of one failed job by failedJobsHistoryLimit ginkgo.By("Ensuring there is 1 finished job by listing jobs explicitly")
ginkgo.It("should delete failed finished jobs with failedJobsHistoryLimit 1", func() { jobs, err = f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{})
ginkgo.By("Creating a AllowConcurrent cronjob with custom history limits") framework.ExpectNoError(err, "Failed to ensure there is one finished job by listing job explicitly in namespace %s", f.Namespace.Name)
failedLimit := int32(1) _, finishedJobs = filterActiveJobs(jobs)
cronJob := newTestCronJob("concurrent-limit", "*/1 * * * ?", batchv1beta1.AllowConcurrent, framework.ExpectEqual(len(finishedJobs), 1)
failureCommand, nil, &failedLimit)
cronJob, err := createCronJob(f.ClientSet, f.Namespace.Name, cronJob)
framework.ExpectNoError(err, "Failed to create allowconcurrent cronjob with custom history limits in namespace %s", f.Namespace.Name)
ginkgo.By("Ensuring a finished job exists") ginkgo.By("Removing cronjob")
err = waitForAnyFinishedJob(f.ClientSet, f.Namespace.Name) err = deleteCronJob(f.ClientSet, f.Namespace.Name, cronJob.Name)
framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists in namespace %s", f.Namespace.Name) framework.ExpectNoError(err, "Failed to remove the %s cronjob in namespace %s", cronJob.Name, f.Namespace.Name)
}
ginkgo.By("Ensuring a finished job exists by listing jobs explicitly")
jobs, err := f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{})
framework.ExpectNoError(err, "Failed to ensure a finished cronjob exists by listing jobs explicitly in namespace %s", f.Namespace.Name)
_, finishedJobs := filterActiveJobs(jobs)
gomega.Expect(len(finishedJobs)).To(gomega.Equal(1))
ginkgo.By("Ensuring this job and its pods does not exist anymore")
err = waitForJobToDisappear(f.ClientSet, f.Namespace.Name, finishedJobs[0])
framework.ExpectNoError(err, "Failed to ensure that job does not exists anymore in namespace %s", f.Namespace.Name)
err = waitForJobsPodToDisappear(f.ClientSet, f.Namespace.Name, finishedJobs[0])
framework.ExpectNoError(err, "Failed to ensure that pods for job does not exists anymore in namespace %s", f.Namespace.Name)
ginkgo.By("Ensuring there is 1 finished job by listing jobs explicitly")
jobs, err = f.ClientSet.BatchV1().Jobs(f.Namespace.Name).List(metav1.ListOptions{})
framework.ExpectNoError(err, "Failed to ensure there is one finished job by listing job explicitly in namespace %s", f.Namespace.Name)
_, finishedJobs = filterActiveJobs(jobs)
gomega.Expect(len(finishedJobs)).To(gomega.Equal(1))
ginkgo.By("Removing cronjob")
err = deleteCronJob(f.ClientSet, f.Namespace.Name, cronJob.Name)
framework.ExpectNoError(err, "Failed to remove the %s cronjob in namespace %s", cronJob.Name, f.Namespace.Name)
}) })
}) })
@ -374,7 +360,8 @@ func getCronJob(c clientset.Interface, ns, name string) (*batchv1beta1.CronJob,
} }
func deleteCronJob(c clientset.Interface, ns, name string) error { func deleteCronJob(c clientset.Interface, ns, name string) error {
return c.BatchV1beta1().CronJobs(ns).Delete(name, nil) propagationPolicy := metav1.DeletePropagationBackground // Also delete jobs and pods related to cronjob
return c.BatchV1beta1().CronJobs(ns).Delete(name, &metav1.DeleteOptions{PropagationPolicy: &propagationPolicy})
} }
// Wait for at least given amount of active jobs. // Wait for at least given amount of active jobs.