github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #902 from jbeda/e2efix

Browse Source 
Fix e2e teardown
This commit is contained in:
brendandburns 2014-08-14 14:24:27 -07:00
commit f521fff89e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/util.sh
View File

@ -357,7 +357,7 @@ function test-teardown {
--project ${PROJECT} \ --project ${PROJECT} \
--norespect_terminal_width \ --norespect_terminal_width \
--force \ --force \
${MINION_TAG}-http-alt ${MINION_TAG}-http-alt || true > /dev/null
$(dirname $0)/../cluster/kube-down.sh > /dev/null $(dirname $0)/../cluster/kube-down.sh > /dev/null
} }

1
hack/e2e-test.sh
View File

@ -43,6 +43,7 @@ export KUBE_REPO_ROOT="$(dirname $0)/.."
export CLOUDCFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match" export CLOUDCFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
if [[ $TEAR_DOWN -ne 0 ]]; then if [[ $TEAR_DOWN -ne 0 ]]; then
detect-project
trap test-teardown EXIT trap test-teardown EXIT
exit 0 exit 0
fi fi