From 0c4031f3a6fb34e49b84a115c5e7f140444488d5 Mon Sep 17 00:00:00 2001 From: fabriziopandini Date: Mon, 8 Apr 2019 14:53:37 +0200 Subject: [PATCH] kubeadm-e2e-JUnitReporter --- test/e2e_kubeadm/BUILD | 2 ++ test/e2e_kubeadm/e2e_kubeadm_suite_test.go | 18 +++++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/test/e2e_kubeadm/BUILD b/test/e2e_kubeadm/BUILD index a1c9772431b..7326af2d14b 100644 --- a/test/e2e_kubeadm/BUILD +++ b/test/e2e_kubeadm/BUILD @@ -34,6 +34,8 @@ go_test( "//staging/src/k8s.io/cluster-bootstrap/token/api:go_default_library", "//test/e2e/framework:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", + "//vendor/github.com/onsi/ginkgo/config:go_default_library", + "//vendor/github.com/onsi/ginkgo/reporters:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/spf13/pflag:go_default_library", "//vendor/gopkg.in/yaml.v2:go_default_library", diff --git a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go index 6a010b4d506..6d1817bbca4 100644 --- a/test/e2e_kubeadm/e2e_kubeadm_suite_test.go +++ b/test/e2e_kubeadm/e2e_kubeadm_suite_test.go @@ -18,13 +18,17 @@ package e2e_kubeadm import ( "flag" + "fmt" "os" + "path/filepath" "testing" "github.com/onsi/ginkgo" + "github.com/onsi/ginkgo/config" "github.com/onsi/gomega" "github.com/spf13/pflag" + morereporters "github.com/onsi/ginkgo/reporters" "k8s.io/kubernetes/test/e2e/framework" ) @@ -42,7 +46,19 @@ func TestMain(m *testing.M) { } func TestE2E(t *testing.T) { - reporters := []ginkgo.Reporter{} gomega.RegisterFailHandler(ginkgo.Fail) + reporters := []ginkgo.Reporter{} + reportDir := framework.TestContext.ReportDir + if reportDir != "" { + // Create the directory if it doesn't already exists + if err := os.MkdirAll(reportDir, 0755); err != nil { + t.Fatalf("Failed creating report directory: %v", err) + } else { + // Configure a junit reporter to write to the directory + junitFile := fmt.Sprintf("junit_%s_%02d.xml", framework.TestContext.ReportPrefix, config.GinkgoConfig.ParallelNode) + junitPath := filepath.Join(reportDir, junitFile) + reporters = append(reporters, morereporters.NewJUnitReporter(junitPath)) + } + } ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "E2EKubeadm suite", reporters) }