github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33498 from spxtr/no-test-xml

Browse Source 
Automatic merge from submit-queue

Un-xmlWrap the Test function.

#33361 is pretty much useless.

We should probably take a look at better integrating the new JUnit results into the munger/testgrid/gubernator, but this should make things better for now.
This commit is contained in:
Kubernetes Submit Queue 2016-09-26 18:02:56 -07:00 committed by GitHub
commit 56bbfd259a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hack/e2e.go
View File

@ -212,10 +212,15 @@ func run() error {
errs = appendError(errs, xmlWrap("kubectl version", func() error { errs = appendError(errs, xmlWrap("kubectl version", func() error {
return finishRunning("kubectl version", exec.Command("./cluster/kubectl.sh", "version", "--match-server-version=false")) return finishRunning("kubectl version", exec.Command("./cluster/kubectl.sh", "version", "--match-server-version=false"))
})) }))
// Individual tests will create their own JUnit, so don't xmlWrap.
if *skewTests { if *skewTests {
errs = appendError(errs, xmlWrap("SkewTest", SkewTest)) errs = appendError(errs, SkewTest())
} else { } else {
errs = appendError(errs, xmlWrap("Test", Test)) if err := xmlWrap("IsUp", IsUp); err != nil {
errs = appendError(errs, err)
} else {
errs = appendError(errs, Test())
}
} }
} }
@ -341,8 +346,8 @@ func Up() error {
} }
// Is the e2e cluster up? // Is the e2e cluster up?
func IsUp() bool { func IsUp() error {
return finishRunning("get status", exec.Command("./hack/e2e-internal/e2e-status.sh")) == nil return finishRunning("get status", exec.Command("./hack/e2e-internal/e2e-status.sh"))
} }
func DumpClusterLogs(location string) error { func DumpClusterLogs(location string) error {
@ -443,10 +448,6 @@ func SkewTest() error {
} }
func Test() error { func Test() error {
if !IsUp() {
return fmt.Errorf("testing requested, but e2e cluster not up!")
}
// TODO(fejta): add a --federated or something similar // TODO(fejta): add a --federated or something similar
if os.Getenv("FEDERATION") != "true" { if os.Getenv("FEDERATION") != "true" {
return finishRunning("Ginkgo tests", exec.Command("./hack/ginkgo-e2e.sh", strings.Fields(*testArgs)...)) return finishRunning("Ginkgo tests", exec.Command("./hack/ginkgo-e2e.sh", strings.Fields(*testArgs)...))