[Federation] Wait after cleanup only if the cleanup succeeds.

It is a waste of time to wait for the resources to cleanup if the
cleanup fails.
pull/6/head
Madhusudan.C.S 2017-02-08 00:26:53 -08:00
parent 01c45f7de1
commit 78bed5fde9
1 changed files with 16 additions and 12 deletions

View File

@ -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"
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
# 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
for zone in ${E2E_ZONES}; do
# bring down an e2e cluster
(
set-federation-zone-vars "$zone"
test-teardown
)
done
done
else
test-teardown
fi