Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -638,13 +638,12 @@ function defer-OCP-60397(){
}

function check_mcp_status() {
local machineCount updatedMachineCount counter
local machineCount updatedMachineCount counter=0 interval=120
machineCount=$(oc get mcp $1 -o=jsonpath='{.status.machineCount}')
counter=0
while [ $counter -lt 1200 ]
while [ $counter -lt 1800 ]
do
sleep 20
counter=`expr $counter + 20`
sleep ${interval}
counter=$((counter + interval))
echo "waiting ${counter}s"
updatedMachineCount=$(oc get mcp $1 -o=jsonpath='{.status.updatedMachineCount}')
if [[ ${updatedMachineCount} = "${machineCount}" ]]; then
Expand Down Expand Up @@ -696,6 +695,11 @@ function pre-OCP-47160(){
echo "Fail to patch featuregate cluster!"
return 1
fi
echo "Wait for MCP rollout to start..."
if ! oc wait mcp --all --for condition=updating --timeout=300s; then
echo "The mcp rollout does not start in 5m!"
return 1
fi
if ! check_mcp_status master || ! check_mcp_status worker ; then
echo "Fail to enable TechPreviewNoUpgrade fs!"
return 1
Expand Down Expand Up @@ -791,6 +795,11 @@ function pre-OCP-47200(){
echo "Fail to patch featuregate cluster!"
return 1
fi
echo "Wait for MCP rollout to start..."
if ! oc wait mcp --all --for condition=updating --timeout=300s; then
echo "The mcp rollout does not start in 5m!"
return 1
fi
if ! check_mcp_status master || ! check_mcp_status worker ; then
echo "Fail to enable CustomNoUpgrade fs!"
return 1
Expand Down