github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #41061 from madhusudancs/fed-cleanup-once

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41061, 40888, 40664, 41020, 41085)

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

cc @kubernetes/sig-federation-pr-reviews
This commit is contained in:
Kubernetes Submit Queue 2017-02-07 23:06:37 -08:00 committed by GitHub
commit 74195979fb
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hack/e2e-internal/e2e-down.sh
View File

@ -31,10 +31,7 @@ prepare-e2e
if [[ "${FEDERATION:-}" == "true" ]];then
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"
# TODO(madhusudancs): This is an arbitrary amount of sleep to give Kubernetes
@ -46,6 +43,10 @@ if [[ "${FEDERATION:-}" == "true" ]];then
# `AfterEach` blocks.
sleep 2m
for zone in ${E2E_ZONES};do
# bring down an e2e cluster
(
set-federation-zone-vars "$zone"
test-teardown
)
done