Improve execution time for job e2e tests

This commit is contained in:
Michal Wozniak 2023-10-26 12:56:15 +02:00
parent 6f4ad7a413
commit e50cc47a06
2 changed files with 5 additions and 2 deletions

View File

@ -262,7 +262,7 @@ var _ = SIGDescribe("Job", func() {
Rules: []batchv1.PodFailurePolicyRule{
{
// Ignore failures of the non 0-indexed pods which fail until the marker file is created
// And the 127 in the 0-indexed pod due to eviction.
// And the 137 in the 0-indexed pod due to eviction.
Action: batchv1.PodFailurePolicyActionIgnore,
OnExitCodes: &batchv1.PodFailurePolicyOnExitCodesRequirement{
Operator: batchv1.PodFailurePolicyOnExitCodesOpIn,

View File

@ -22,6 +22,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/rand"
"k8s.io/kubernetes/test/e2e/framework"
imageutils "k8s.io/kubernetes/test/utils/image"
"k8s.io/utils/ptr"
)
// NewTestJob returns a Job which does one of several testing behaviors. notTerminate starts a Job that will run
@ -91,7 +93,7 @@ func NewTestJobOnNode(behavior, name string, rPol v1.RestartPolicy, parallelism,
}
switch behavior {
case "notTerminate":
job.Spec.Template.Spec.Containers[0].Command = []string{"sleep", "1000000"}
job.Spec.Template.Spec.Containers[0].Image = imageutils.GetPauseImageName()
case "fail":
job.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh", "-c", "exit 1"}
case "failOddSucceedEven":
@ -126,6 +128,7 @@ func NewTestJobOnNode(behavior, name string, rPol v1.RestartPolicy, parallelism,
// the non-0-indexed pods are succeeded is used to determine that the
// 0th indexed pod already created the marker file.
setupHostPathDirectory(job)
job.Spec.Template.Spec.TerminationGracePeriodSeconds = ptr.To(int64(1))
job.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh", "-c", "if [[ -r /data/foo ]] ; then exit 0 ; elif [[ $JOB_COMPLETION_INDEX -eq 0 ]] ; then touch /data/foo ; sleep 1000000 ; else exit 1 ; fi"}
}
return job