Skip to content

Commit 34e0593

Browse files
authored
ROSA should wait until job/osd-cluster-ready is done (openshift#58946)
wait-ready-operators waits for cluster operators, but not the managed service side of things. We should wait until job/osd-cluster-ready is complete.
1 parent 5b4ffa3 commit 34e0593

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

ci-operator/step-registry/rosa/cluster/wait-ready/operators/rosa-cluster-wait-ready-operators-commands.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,3 +65,14 @@ else
6565
record_cluster "timers" "co_wait_time" $(( "${end_time}" - "${start_time}" ))
6666
echo "All cluster operators ready after $(( ${end_time} - ${start_time} )) seconds"
6767
fi
68+
69+
# Additionally, OSD has a job "osd-cluster-ready" that determines when
70+
# the managed service operators are done and the cluster is truly ready.
71+
# Don't consider the cluster ready until that's done.
72+
while ! oc get job/osd-cluster-ready -n openshift-monitoring &>/dev/null; do
73+
echo "Waiting for job/osd-cluster-ready to exist..."
74+
sleep 30
75+
done
76+
77+
echo "Waiting for job/osd-cluster-ready to complete..."
78+
oc wait --for=condition=complete job/osd-cluster-ready -n openshift-monitoring --timeout=60m

0 commit comments

Comments
 (0)