Skip to content

change timer to be more accurate #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chrisahl wants to merge 8 commits into
base: master
Choose a base branch
from
Draft

change timer to be more accurate #119

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
88db9ff
change timer to be more accurate
chrisahl Jul 6, 2020
ff34166
change timer to be more accurate
chrisahl Jul 6, 2020
68cd742
Merge branch 'master' of github.com:open-cluster-management/deploy in…
chrisahl Jul 6, 2020
9555acf
change timer to be more accurate
chrisahl Jul 6, 2020
f293fa4
change timer to be more accurate
chrisahl Jul 6, 2020
c89500a
change timer to be more accurate
chrisahl Jul 7, 2020
1235270
merge from master
chrisahl Jul 7, 2020
d7aec6e
merge from master
chrisahl Jul 7, 2020
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
16 changes: 8 additions & 8 deletions start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@ TOTAL_POD_COUNT_2X=55
function waitForPod() {
FOUND=1
MINUTE=0
CURRENT_TIME=`date +%s`
EXPIRE_TIME=$(($CURRENT_TIME+300))
podName=$1
ignore=$2
running="$3"
printf "\n#####\nWait for ${podName} to reach running state (4min).\n"
printf "\n#####\nWait for ${podName} to reach running state (5 min).\n"
while [ ${FOUND} -eq 1 ]; do
# Wait up to 4min, should only take about 20-30s
if [ $MINUTE -gt 240 ]; then
CURRENT_TIME=`date +%s`
# Wait up to 5 min, should only take about 20-30s
if [ $CURRENT_TIME -gt $EXPIRE_TIME ]; then
echo "Timeout waiting for the ${podName}. Try cleaning up using the uninstall scripts before running again."
echo "List of current pods:"
oc -n ${TARGET_NAMESPACE} get pods
Expand All @@ -40,8 +43,7 @@ function waitForPod() {
operatorPod="Waiting"
fi
echo "* STATUS: $operatorPod"
sleep 3
(( MINUTE = MINUTE + 3 ))
sleep 5
done
}

Expand Down Expand Up @@ -135,7 +137,7 @@ CUSTOM_REGISTRY_REPO=${CUSTOM_REGISTRY_REPO:-"quay.io/open-cluster-management"}
# Default COMPOSITE_BUNDLE to true
COMPOSITE_BUNDLE=${COMPOSITE_BUNDLE:-"true"}

# If the user sets the COMPOSITE_BUNDLE flag to "true", then set to the `acm` variants of variables, otherwise the multicluster-hub version.
# If the user sets the COMPOSITE_BUNDLE flag to "true", then set to the `acm` variants of variables, otherwise the multicluster-hub version.
if [[ "$COMPOSITE_BUNDLE" == "true" ]]; then OPERATOR_DIRECTORY="acm-operator"; else OPERATOR_DIRECTORY="multicluster-hub-operator"; fi;
if [[ "$COMPOSITE_BUNDLE" == "true" ]]; then CUSTOM_REGISTRY_IMAGE="acm-custom-registry"; else CUSTOM_REGISTRY_IMAGE="multicluster-hub-custom-registry"; fi;

Expand Down Expand Up @@ -245,5 +247,3 @@ if [ "${OS}" == "darwin" ]; then
else
echo "Deploying, use \"watch oc -n ${TARGET_NAMESPACE} get pods\" to monitor progress. Expect around ${TOTAL_POD_COUNT} pods"
fi