Skip to content

Commit 8b9e391

Browse files
authored
Modifying wait_for_jobset to get the jobset from helm release name (GoogleCloudPlatform#771)
1 parent f6a9fcb commit 8b9e391

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

dags/map_reproducibility/utils/common_utils.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -548,15 +548,17 @@ def wait_for_jobsets_cmds(timeout: str = "100m"):
548548
A tuple of command strings.
549549
"""
550550
wait_for_jobset = (
551-
'echo "Listing pods associated with JobSet $JOB_NAME:"',
552-
"kubectl get pods --selector=jobset.sigs.k8s.io/jobset-name=$JOB_NAME --namespace=default",
553-
'echo "Will wait for JobSet $JOB_NAME to finish..."',
551+
"""export JOBSET_NAME=$(kubectl get jobset -o custom-columns=NAME:.metadata.name,NAME2:.metadata.annotations |grep meta.helm.sh/release-name:$JOB_NAME | awk {'print $1'})""",
552+
'echo "Release Name: $JOB_NAME - JOBSET_NAME: $JOBSET_NAME"',
553+
'echo "Listing pods associated with JobSet $JOBSET_NAME:"',
554+
"kubectl get pods --selector=jobset.sigs.k8s.io/jobset-name=$JOBSET_NAME --namespace=default",
555+
'echo "Will wait for JobSet $JOBSET_NAME to finish..."',
554556
# The condition for JobSet completion is typically 'Completed'.
555-
f"kubectl wait --for=condition=Completed jobset/$JOB_NAME --namespace=default --timeout={timeout}",
556-
'echo "JobSet $JOB_NAME finished. Describing JobSet:"',
557-
"kubectl describe jobset $JOB_NAME --namespace=default",
558-
'echo "Final pod status for JobSet $JOB_NAME:"',
559-
"kubectl get pods --selector=jobset.sigs.k8s.io/jobset-name=$JOB_NAME --namespace=default",
557+
f"kubectl wait --for=condition=Completed jobset/$JOBSET_NAME --namespace=default --timeout={timeout}",
558+
'echo "JobSet $JOBSET_NAME finished. Describing JobSet:"',
559+
"kubectl describe jobset $JOBSET_NAME --namespace=default",
560+
'echo "Final pod status for JobSet $JOBSET_NAME:"',
561+
"kubectl get pods --selector=jobset.sigs.k8s.io/jobset-name=$JOBSET_NAME --namespace=default",
560562
)
561563
return wait_for_jobset
562564

0 commit comments

Comments
 (0)