Skip to content

K
k3s
Commit 56bbfd25 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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

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.
parents 35e9f4d0 52cfe253
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 8 deletions
hack/e2e.go
View file @ 56bbfd25
......@@ -212,10 +212,15 @@ func run() error {
errs = appendError(errs, xmlWrap("kubectl version", func() error {
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 {
errs = appendError(errs, xmlWrap("SkewTest", SkewTest))
errs = appendError(errs, SkewTest())
} 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?
func IsUp() bool {
return finishRunning("get status", exec.Command("./hack/e2e-internal/e2e-status.sh")) == nil
func IsUp() error {
return finishRunning("get status", exec.Command("./hack/e2e-internal/e2e-status.sh"))
}
func DumpClusterLogs(location string) error {
......@@ -443,10 +448,6 @@ func SkewTest() error {
}
func Test() error {
if !IsUp() {
return fmt.Errorf("testing requested, but e2e cluster not up!")
}
// TODO(fejta): add a --federated or something similar
if os.Getenv("FEDERATION") != "true" {
return finishRunning("Ginkgo tests", exec.Command("./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