From dca1f5a88a090d21cd6273aa7e3921bbfe3db81e Mon Sep 17 00:00:00 2001
From: Joe Finney <spxtr@google.com>
Date: Thu, 19 May 2016 14:57:00 -0700
Subject: [PATCH] Run setupProviderConfig in BeforeSuite.

---
 test/e2e/e2e.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
index a212fafa3e5..d211ed16d92 100644
--- a/test/e2e/e2e.go
+++ b/test/e2e/e2e.go
@@ -97,6 +97,10 @@ func setupProviderConfig() error {
 var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 	// Run only on Ginkgo node 1
 
+	if err := setupProviderConfig(); err != nil {
+		framework.Failf("Failed to setup provider config: %v", err)
+	}
+
 	// Delete any namespaces except default and kube-system. This ensures no
 	// lingering resources are left over from a previous test run.
 	if framework.TestContext.CleanStart {
@@ -135,6 +139,11 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
 }, func(data []byte) {
 	// Run on all Ginkgo nodes
 
+	if cloudConfig.Provider == nil {
+		if err := setupProviderConfig(); err != nil {
+			framework.Failf("Failed to setup provider config: %v", err)
+		}
+	}
 })
 
 type CleanupActionHandle *int
@@ -202,12 +211,6 @@ func RunE2ETests(t *testing.T) {
 	util.InitLogs()
 	defer util.FlushLogs()
 
-	// We must call setupProviderConfig first since SynchronizedBeforeSuite needs
-	// cloudConfig to be set up already.
-	if err := setupProviderConfig(); err != nil {
-		glog.Fatalf(err.Error())
-	}
-
 	gomega.RegisterFailHandler(ginkgo.Fail)
 	// Disable skipped tests unless they are explicitly requested.
 	if config.GinkgoConfig.FocusString == "" && config.GinkgoConfig.SkipString == "" {