github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #126194 from mimowo/job-e2e-tests-cleanup

Browse Source 
Format helper scripts in Job e2e tests as multiline for readability
This commit is contained in:
Kubernetes Prow Robot
2024-07-18 09:33:39 -07:00
committed by GitHub
parent 73198f893c 2d680054c1
commit 3adafc6a50
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/e2e/framework/job/fixtures.go
View File

@@ -126,7 +126,16 @@ func NewTestJobOnNode(behavior, name string, rPol v1.RestartPolicy, parallelism,
// ensure all job pods run on a single node and the volume
// will be mounted from a hostPath instead.
setupHostPathDirectory(job)
job.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh", "-c", "if [[ -r /data/foo ]] ; then exit 0 ; else touch /data/foo ; exit 1 ; fi"}
job.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh", "-c"}
job.Spec.Template.Spec.Containers[0].Args = []string{`
if [[ -r /data/foo ]]
then
exit 0
else
touch /data/foo
exit 1
fi
`}
case "notTerminateOnce":
// Do not terminate the 0-indexed pod in the first run and
// succeed the second time. Fail the non-0-indexed pods until
@@ -135,7 +144,19 @@ func NewTestJobOnNode(behavior, name string, rPol v1.RestartPolicy, parallelism,
// 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"}
job.Spec.Template.Spec.Containers[0].Command = []string{"/bin/sh", "-c"}
job.Spec.Template.Spec.Containers[0].Args = []string{`
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
}