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

Automatic merge from submit-queue Only run federation tests if FEDERATION==true.
lavalamp · Jul 16, 2016 · e60df08 · e60df08
2 parents 5e1b75d + c342d8f
commit e60df08
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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)...))
 	}
 }