From fae27e2f173c5a30fefbbbead884d708348bfe89 Mon Sep 17 00:00:00 2001
From: Haney Maxwell <hmrmaxwell@gmail.com>
Date: Tue, 11 Nov 2014 11:03:07 -0800
Subject: [PATCH] Clean up e2e test

---
 cluster/gce/util.sh       | 5 +++++
 cluster/rackspace/util.sh | 5 +++++
 cluster/vagrant/util.sh   | 5 +++++
 hack/e2e.go               | 4 +---
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index a3e4bebb909..4d25b3ffe7d 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -621,3 +621,8 @@ function teardown-monitoring {
 	monitoring-heapster || true > /dev/null
   fi
 }
+
+# Perform preparations required to run e2e tests
+function prepare-e2e() {
+  detect-project
+}
diff --git a/cluster/rackspace/util.sh b/cluster/rackspace/util.sh
index 4e93aa1b63e..28999b57d19 100644
--- a/cluster/rackspace/util.sh
+++ b/cluster/rackspace/util.sh
@@ -326,3 +326,8 @@ kube-up() {
 function setup-monitoring {
     echo "TODO"
 }
+
+# Perform preparations required to run e2e tests
+function prepare-e2e() {
+  echo "Rackspace doesn't need special preparations for e2e tests"
+}
diff --git a/cluster/vagrant/util.sh b/cluster/vagrant/util.sh
index c676782660d..371b6d684ef 100644
--- a/cluster/vagrant/util.sh
+++ b/cluster/vagrant/util.sh
@@ -176,3 +176,8 @@ function restart-kube-proxy {
 function setup-monitoring {
     echo "TODO"
 }
+
+# Perform preparations required to run e2e tests
+function prepare-e2e() {
+  echo "Vagrant doesn't need special preparations for e2e tests"
+}
diff --git a/hack/e2e.go b/hack/e2e.go
index 71fdce49c3d..6b8fb964b75 100644
--- a/hack/e2e.go
+++ b/hack/e2e.go
@@ -224,9 +224,7 @@ export KUBECFG="` + *root + `/cluster/kubecfg.sh -expect_version_match"
 source "` + *root + `/cluster/kube-env.sh"
 source "` + *root + `/cluster/${KUBERNETES_PROVIDER}/util.sh"
 
-if [[ ${KUBERNETES_PROVIDER} == "gce" ]]; then
-  detect-project
-fi
+prepare-e2e
 
 `