github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-31 07:20:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #892 from brendandburns/teardown

Browse Source 
Add a teardown option to the e2e, that just tears down the cluster, also make gce teardown synchronous.
This commit is contained in:
Daniel Smith 2014-08-14 10:11:13 -07:00
commit 43e1c14e8b
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cluster/gce/util.sh
View File

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

6
hack/e2e-test.sh
View File

@ -24,6 +24,7 @@ source $(dirname $0)/../cluster/$KUBERNETES_PROVIDER/util.sh
# cluster running.
ALREADY_UP=${1:-0}
LEAVE_UP=${2:-0}
TEAR_DOWN=${3:-0}
HAVE_JQ=$(which jq)
if [[ -z ${HAVE_JQ} ]]; then
@ -41,6 +42,11 @@ export KUBE_CONFIG_FILE="config-test.sh"
export KUBE_REPO_ROOT="$(dirname $0)/.."
export CLOUDCFG="${KUBE_REPO_ROOT}/cluster/kubecfg.sh -expect_version_match"
if [[ $TEAR_DOWN -ne 0 ]]; then
trap test-teardown EXIT
exit 0
fi
# Build a release required by the test provider [if any]
test-build-release