Skip to content

K
k3s
Commit c342d8fc authored by Matt Liggett's avatar Matt Liggett
Browse files
Options

Only run federation tests if FEDERATION==true.

This is the same test we make everywhere else. Only here were we checking against the empty string.
parent e576a2f7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
hack/e2e.go
View file @ c342d8fc
...@@ -193,14 +193,13 @@ func Test() bool { ...@@ -193,14 +193,13 @@ func Test() bool {
ValidateClusterSize() ValidateClusterSize()
} }
if os.Getenv("FEDERATION") == "" { if os.Getenv("FEDERATION") == "true" {
return finishRunning("Ginkgo tests", exec.Command(filepath.Join(*root, "hack/ginkgo-e2e.sh"), strings.Fields(*testArgs)...))
} else {
if *testArgs == "" { if *testArgs == "" {
*testArgs = "--ginkgo.focus=\\[Feature:Federation\\]" *testArgs = "--ginkgo.focus=\\[Feature:Federation\\]"
} }
return finishRunning("Federated Ginkgo tests", exec.Command(filepath.Join(*root, "hack/federated-ginkgo-e2e.sh"), strings.Fields(*testArgs)...)) 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)...))
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment