github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Automatic merge from submit-queue

Only run federation tests if FEDERATION==true.
pull/6/head
k8s-merge-robot 2016-07-15 20:36:37 -07:00 committed by GitHub
parent 5e1b75d164 c342d8fc12
commit e60df08532
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hack/e2e.go
View File

@ -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)...))
} }
} }