Skip to content

K
k3s
Commit e60df085 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

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

Automatic merge from submit-queue Only run federation tests if FEDERATION==true.
parents 5e1b75d1 c342d8fc
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
hack/e2e.go
View file @ e60df085
...@@ -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