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

Move E2E kube-up call into test-setup from e2e-internal.

Browse Source
This commit is contained in:
Joe Finney
2016-02-17 16:49:07 -08:00
parent 98981ac3ec
commit 2b756ca56d
9 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hack/e2e-internal/e2e-up.sh
View File

@@ -31,14 +31,4 @@ source "${KUBE_VERSION_ROOT}/cluster/${KUBERNETES_PROVIDER}/util.sh"
prepare-e2e
if [[ ${MULTIZONE:-} == "true" ]]; then
for KUBE_GCE_ZONE in ${E2E_ZONES}
do
KUBE_GCE_ZONE="${KUBE_GCE_ZONE}" KUBE_USE_EXISTING_MASTER="${KUBE_USE_EXISTING_MASTER:-}" KUBE_TEST_DEBUG=y "${KUBE_VERSION_ROOT}/cluster/kube-up.sh"
KUBE_USE_EXISTING_MASTER="true" # For subsequent zones we use the existing master
done
else
KUBE_TEST_DEBUG=y "${KUBE_VERSION_ROOT}/cluster/kube-up.sh"
fi
test-setup

2
hack/e2e.go
View File

@@ -122,6 +122,7 @@ func main() {
}
os.Setenv("KUBECTL", versionRoot+`/cluster/kubectl.sh`+kubectlArgs())
os.Setenv("KUBE_TEST_DEBUG", "y")
if *pushup {
if IsUp() {
@@ -175,7 +176,6 @@ func Up() bool {
return false
}
}
return finishRunning("up", exec.Command(path.Join(*root, "hack/e2e-internal/e2e-up.sh")))
}