Skip to content

Commit

Permalink
[Federation] Wait after cleanup only if the cleanup succeeds.
Browse files Browse the repository at this point in the history
It is a waste of time to wait for the resources to cleanup if the
cleanup fails.
  • Loading branch information
madhusudancs committed Feb 8, 2017
1 parent 01c45f7 commit 78bed5f
Showing 1 changed file with 17 additions and 13 deletions.
30 changes: 17 additions & 13 deletions hack/e2e-internal/e2e-down.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,24 +32,28 @@ prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]];then
source "${KUBE_ROOT}/federation/cluster/common.sh"

cleanup-federation-api-objects || echo "Couldn't cleanup federation api objects"

# TODO(madhusudancs): This is an arbitrary amount of sleep to give Kubernetes
# clusters enough time to delete the underlying cloud provider resources
# corresponding to the Kubernetes resources we deleted as part of the test
# teardowns. It is shameful that we are doing this, but this is just a bandage
# to stop the bleeding. Please don't use this pattern anywhere. Remove this
# when proper cloud provider cleanups are implemented in the individual test
# `AfterEach` blocks.
sleep 2m

for zone in ${E2E_ZONES};do
if cleanup-federation-api-objects; then
# TODO(madhusudancs): This is an arbitrary amount of sleep to give
# Kubernetes clusters enough time to delete the underlying cloud
# provider resources corresponding to the Kubernetes resources we
# deleted as part of the test tear downs. It is shameful that we
# are doing this, but this is just a bandage to stop the bleeding.
# Please don't use this pattern anywhere. Remove this when proper
# cloud provider cleanups are implemented in the individual test
# `AfterEach` blocks.
# Also, we wait only if the cleanup succeeds.
sleep 2m
else
echo "Couldn't cleanup federation api objects"
fi

for zone in ${E2E_ZONES}; do
# bring down an e2e cluster
(
set-federation-zone-vars "$zone"
test-teardown
)
done
done
else
test-teardown
fi

0 comments on commit 78bed5f

Please sign in to comment.