Merge pull request #29038 from mml/e2e-federation-env

Automatic merge from submit-queue Only run federation tests if FEDERATION==true.

Merge pull request #29038 from mml/e2e-federation-env
e60df085 · k8s-merge-robot · GitHub · 5e1b75d1 · c342d8fc · e60df085
Commit e60df085 authored Jul 15, 2016 by k8s-merge-robot Committed by GitHub Jul 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

e2e.go hack/e2e.go +3 -4

No files found.
--- a/hack/e2e.go
+++ b/hack/e2e.go
@@ -193,14 +193,13 @@ func Test() bool {
 		ValidateClusterSize()
 	}

-	if os.Getenv("FEDERATION") == "" {
-		return finishRunning("Ginkgo tests", exec.Command(filepath.Join(*root, "hack/ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
-	} else {
-
+	if os.Getenv("FEDERATION") == "true" {
 		if *testArgs == "" {
 			*testArgs = "--ginkgo.focus=\\[Feature:Federation\\]"
 		}
 		return finishRunning("Federated Ginkgo tests", exec.Command(filepath.Join(*root, "hack/federated-ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
+	} else {
+		return finishRunning("Ginkgo tests", exec.Command(filepath.Join(*root, "hack/ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
 	}
 }