Cleanup federation components and wait for it only once in a test cycle.

pull/6/head
Madhusudan.C.S 2017-02-07 00:48:15 -08:00
parent d4bcf3ede5
commit 26c0fe32d0
1 changed files with 12 additions and 11 deletions

View File

@ -31,10 +31,7 @@ prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]];then if [[ "${FEDERATION:-}" == "true" ]];then
source "${KUBE_ROOT}/federation/cluster/common.sh" source "${KUBE_ROOT}/federation/cluster/common.sh"
for zone in ${E2E_ZONES};do
# bring down an e2e cluster
(
set-federation-zone-vars "$zone"
cleanup-federation-api-objects || echo "Couldn't cleanup federation api objects" cleanup-federation-api-objects || echo "Couldn't cleanup federation api objects"
# TODO(madhusudancs): This is an arbitrary amount of sleep to give Kubernetes # TODO(madhusudancs): This is an arbitrary amount of sleep to give Kubernetes
@ -46,6 +43,10 @@ if [[ "${FEDERATION:-}" == "true" ]];then
# `AfterEach` blocks. # `AfterEach` blocks.
sleep 2m sleep 2m
for zone in ${E2E_ZONES};do
# bring down an e2e cluster
(
set-federation-zone-vars "$zone"
test-teardown test-teardown
) )
done done