From 4b246c26349b8591bde8edd35fe26c466ac24931 Mon Sep 17 00:00:00 2001 From: Jakob Schrettenbrunner Date: Wed, 17 Aug 2022 11:52:43 +0200 Subject: [PATCH] remove prow ginkgo helper --- .gitignore | 3 +- hack/test-all.sh | 15 ++++++- pkg/builder/builder_suite_test.go | 5 --- pkg/cache/cache_suite_test.go | 5 --- pkg/cache/internal/internal_suite_test.go | 5 --- pkg/certwatcher/certwatcher_suite_test.go | 5 --- pkg/client/apiutil/apiutil_suite_test.go | 5 --- pkg/client/client_suite_test.go | 5 --- pkg/client/config/config_suite_test.go | 5 --- pkg/client/fake/client_suite_test.go | 5 --- pkg/cluster/cluster_suite_test.go | 5 --- pkg/config/config_suite_test.go | 6 --- pkg/controller/controller_suite_test.go | 5 --- .../controllerutil_suite_test.go | 5 --- pkg/envtest/envtest_suite_test.go | 5 --- pkg/envtest/printer/prow.go | 41 ++++++++----------- pkg/finalizer/finalizer_test.go | 5 --- pkg/handler/eventhandler_suite_test.go | 5 --- pkg/healthz/healthz_suite_test.go | 5 --- .../controller/controller_suite_test.go | 5 --- pkg/internal/recorder/recorder_suite_test.go | 5 --- pkg/internal/testing/addr/addr_suite_test.go | 6 --- .../testing/certs/certs_suite_test.go | 6 --- .../controlplane/controlplane_suite_test.go | 6 --- .../testing/process/process_suite_test.go | 6 --- pkg/log/log_suite_test.go | 5 --- pkg/log/zap/zap_suite_test.go | 5 --- pkg/manager/manager_suite_test.go | 5 --- pkg/manager/signals/signals_suite_test.go | 5 --- pkg/predicate/predicate_suite_test.go | 5 --- pkg/reconcile/reconcile_suite_test.go | 5 --- pkg/runtime/inject/inject_suite_test.go | 5 --- pkg/scheme/scheme_suite_test.go | 6 --- pkg/source/internal/internal_suite_test.go | 5 --- pkg/source/source_suite_test.go | 5 --- pkg/webhook/admission/admission_suite_test.go | 5 --- .../authentication_suite_test.go | 5 --- .../conversion/conversion_suite_test.go | 7 +--- pkg/webhook/webhook_suite_test.go | 5 --- 39 files changed, 34 insertions(+), 213 deletions(-) diff --git a/.gitignore b/.gitignore index 9ba9ceaa9a..47001f46c0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,8 @@ # Test binary, build with `go test -c` *.test -test-report.xml + +junit-report.xml # Output of the go coverage tool, specifically when used with LiteIDE *.out diff --git a/hack/test-all.sh b/hack/test-all.sh index 266182fc0b..4827a61ab2 100755 --- a/hack/test-all.sh +++ b/hack/test-all.sh @@ -26,8 +26,19 @@ source ${hack_dir}/common.sh header_text "running tests using ginkgo" -${hack_dir}/tools/bin/ginkgo --junit-report test-report.xml --keep-going --race -r ${P_FLAG} ${MOD_OPT} +if [[ -n ${ARTIFACTS:-} ]]; then + GINKGO_ARGS="--junit-report junit-report.xml" +fi + +ginkgo_result=0 +${hack_dir}/tools/bin/ginkgo --keep-going --race -r ${GINKGO_ARGS} ${P_FLAG} ${MOD_OPT} || ginkgo_result=$? if [[ -n ${ARTIFACTS:-} ]]; then - if grep -Rin '' ${ARTIFACTS}/*; then exit 1; fi + mv ./junit-report.xml ${ARTIFACTS}/junit-report.xml fi + +# if [[ -n ${ARTIFACTS:-} ]]; then +# if grep -Rin '' ${ARTIFACTS}/*; then exit 1; fi +# fi + +exit $ginkgo_result diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go index a3a25a8798..8fb55b1e0b 100644 --- a/pkg/builder/builder_suite_test.go +++ b/pkg/builder/builder_suite_test.go @@ -28,7 +28,6 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" "sigs.k8s.io/controller-runtime/pkg/internal/testing/addr" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -76,10 +75,6 @@ var _ = AfterSuite(func() { webhook.DefaultPort = 9443 }) -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) - func addCRDToEnvironment(env *envtest.Environment, gvks ...schema.GroupVersionKind) { for _, gvk := range gvks { plural, singular := meta.UnsafeGuessKindToResource(gvk) diff --git a/pkg/cache/cache_suite_test.go b/pkg/cache/cache_suite_test.go index 2c5b1f7f6c..3eeb77f545 100644 --- a/pkg/cache/cache_suite_test.go +++ b/pkg/cache/cache_suite_test.go @@ -24,7 +24,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -56,7 +55,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/cache/internal/internal_suite_test.go b/pkg/cache/internal/internal_suite_test.go index 56cfe2cb80..1bdfdca79f 100644 --- a/pkg/cache/internal/internal_suite_test.go +++ b/pkg/cache/internal/internal_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Cache Internal Suite" @@ -30,7 +29,3 @@ func TestSource(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/certwatcher/certwatcher_suite_test.go b/pkg/certwatcher/certwatcher_suite_test.go index e74ebb0e2a..a346c194d7 100644 --- a/pkg/certwatcher/certwatcher_suite_test.go +++ b/pkg/certwatcher/certwatcher_suite_test.go @@ -22,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -47,7 +46,3 @@ var _ = AfterSuite(func() { _ = os.Remove(file) } }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/client/apiutil/apiutil_suite_test.go b/pkg/client/apiutil/apiutil_suite_test.go index 2502afa735..86350feb28 100644 --- a/pkg/client/apiutil/apiutil_suite_test.go +++ b/pkg/client/apiutil/apiutil_suite_test.go @@ -22,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "k8s.io/client-go/rest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -43,7 +42,3 @@ var _ = BeforeSuite(func() { // for things that technically need a rest.Config for defaulting, but don't actually use them cfg = &rest.Config{} }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/client/client_suite_test.go b/pkg/client/client_suite_test.go index b229c68c56..bfd29c840c 100644 --- a/pkg/client/client_suite_test.go +++ b/pkg/client/client_suite_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/examples/crd/pkg" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -61,7 +60,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/client/config/config_suite_test.go b/pkg/client/config/config_suite_test.go index 1bee02b10d..5eae6f5562 100644 --- a/pkg/client/config/config_suite_test.go +++ b/pkg/client/config/config_suite_test.go @@ -22,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -37,7 +36,3 @@ func TestConfig(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/client/fake/client_suite_test.go b/pkg/client/fake/client_suite_test.go index 796b05163d..2eff1a60af 100644 --- a/pkg/client/fake/client_suite_test.go +++ b/pkg/client/fake/client_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" @@ -37,7 +36,3 @@ func TestSource(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/cluster/cluster_suite_test.go b/pkg/cluster/cluster_suite_test.go index 5d204a2d34..dc804bdd82 100644 --- a/pkg/cluster/cluster_suite_test.go +++ b/pkg/cluster/cluster_suite_test.go @@ -25,7 +25,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -69,7 +68,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/config/config_suite_test.go b/pkg/config/config_suite_test.go index 976d0ba1a9..d1ee19532b 100644 --- a/pkg/config/config_suite_test.go +++ b/pkg/config/config_suite_test.go @@ -21,8 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Config Suite" @@ -31,7 +29,3 @@ func TestScheme(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go index f810c23f78..1454e55aad 100644 --- a/pkg/controller/controller_suite_test.go +++ b/pkg/controller/controller_suite_test.go @@ -29,7 +29,6 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllertest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics" @@ -91,7 +90,3 @@ var _ = AfterSuite(func() { // Put the DefaultBindAddress back metrics.DefaultBindAddress = ":8080" }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/controller/controllerutil/controllerutil_suite_test.go b/pkg/controller/controllerutil/controllerutil_suite_test.go index f4ab0448b5..4d3640eec9 100644 --- a/pkg/controller/controllerutil/controllerutil_suite_test.go +++ b/pkg/controller/controllerutil/controllerutil_suite_test.go @@ -25,7 +25,6 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Controllerutil Suite" @@ -54,7 +53,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/envtest/envtest_suite_test.go b/pkg/envtest/envtest_suite_test.go index a6dc7f4567..64f9f34a45 100644 --- a/pkg/envtest/envtest_suite_test.go +++ b/pkg/envtest/envtest_suite_test.go @@ -24,7 +24,6 @@ import ( admissionv1 "k8s.io/api/admissionregistration/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -135,7 +134,3 @@ func initializeWebhookInEnvironment() { var _ = AfterSuite(func() { Expect(env.Stop()).NotTo(HaveOccurred()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/envtest/printer/prow.go b/pkg/envtest/printer/prow.go index c67976e129..8c7df070d1 100644 --- a/pkg/envtest/printer/prow.go +++ b/pkg/envtest/printer/prow.go @@ -17,13 +17,8 @@ limitations under the License. package printer import ( - "fmt" - "os" - "path/filepath" "sync" - "github.com/onsi/ginkgo/v2" - "github.com/onsi/ginkgo/v2/reporters" "k8s.io/apimachinery/pkg/util/sets" ) @@ -33,21 +28,21 @@ var ( ) // AddReport adds. -func AddReport(report ginkgo.Report, suiteName string) { - allRegisteredSuitesLock.Lock() - if allRegisteredSuites.Has(suiteName) { - panic(fmt.Sprintf("Suite named %q registered more than once", suiteName)) - } - allRegisteredSuites.Insert(suiteName) - allRegisteredSuitesLock.Unlock() - - artifactsDir := os.Getenv("ARTIFACTS") - - if os.Getenv("CI") != "" && artifactsDir != "" { - path := filepath.Join(artifactsDir, fmt.Sprintf("junit_%s_%d.xml", suiteName, report.SuiteConfig.ParallelProcess)) - err := reporters.GenerateJUnitReport(report, path) - if err != nil { - fmt.Printf("Failed to generate report\n\t%s", err.Error()) - } - } -} +// func AddReport(report ginkgo.Report, suiteName string) { +// allRegisteredSuitesLock.Lock() +// if allRegisteredSuites.Has(suiteName) { +// panic(fmt.Sprintf("Suite named %q registered more than once", suiteName)) +// } +// allRegisteredSuites.Insert(suiteName) +// allRegisteredSuitesLock.Unlock() + +// artifactsDir := os.Getenv("ARTIFACTS") + +// if os.Getenv("CI") != "" && artifactsDir != "" { +// path := filepath.Join(artifactsDir, fmt.Sprintf("junit_%s_%d.xml", suiteName, report.SuiteConfig.ParallelProcess)) +// err := reporters.GenerateJUnitReport(report, path) +// if err != nil { +// fmt.Printf("Failed to generate report\n\t%s", err.Error()) +// } +// } +// } diff --git a/pkg/finalizer/finalizer_test.go b/pkg/finalizer/finalizer_test.go index 15350abee5..b0376d1570 100644 --- a/pkg/finalizer/finalizer_test.go +++ b/pkg/finalizer/finalizer_test.go @@ -10,7 +10,6 @@ import ( corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) type mockFinalizer struct { @@ -216,7 +215,3 @@ var _ = Describe("TestFinalizer", func() { }) }) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/handler/eventhandler_suite_test.go b/pkg/handler/eventhandler_suite_test.go index 96264ccb6b..ff4d60ebc9 100644 --- a/pkg/handler/eventhandler_suite_test.go +++ b/pkg/handler/eventhandler_suite_test.go @@ -23,7 +23,6 @@ import ( . "github.com/onsi/gomega" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -50,7 +49,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/healthz/healthz_suite_test.go b/pkg/healthz/healthz_suite_test.go index ce69f9e974..e5c3a91ef9 100644 --- a/pkg/healthz/healthz_suite_test.go +++ b/pkg/healthz/healthz_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -36,7 +35,3 @@ func TestHealthz(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/internal/controller/controller_suite_test.go b/pkg/internal/controller/controller_suite_test.go index 20015ac654..7a905349e2 100644 --- a/pkg/internal/controller/controller_suite_test.go +++ b/pkg/internal/controller/controller_suite_test.go @@ -24,7 +24,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -56,7 +55,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/internal/recorder/recorder_suite_test.go b/pkg/internal/recorder/recorder_suite_test.go index 671783ddf3..f785b63743 100644 --- a/pkg/internal/recorder/recorder_suite_test.go +++ b/pkg/internal/recorder/recorder_suite_test.go @@ -24,7 +24,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -56,7 +55,3 @@ var _ = BeforeSuite(func() { var _ = AfterSuite(func() { Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/internal/testing/addr/addr_suite_test.go b/pkg/internal/testing/addr/addr_suite_test.go index baa40102d3..fa185306c1 100644 --- a/pkg/internal/testing/addr/addr_suite_test.go +++ b/pkg/internal/testing/addr/addr_suite_test.go @@ -21,8 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Addr Suite" @@ -32,7 +30,3 @@ func TestAddr(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/internal/testing/certs/certs_suite_test.go b/pkg/internal/testing/certs/certs_suite_test.go index 085c092be9..42881d4743 100644 --- a/pkg/internal/testing/certs/certs_suite_test.go +++ b/pkg/internal/testing/certs/certs_suite_test.go @@ -21,8 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "TinyCA (Internal Certs) Suite" @@ -32,7 +30,3 @@ func TestInternal(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/internal/testing/controlplane/controlplane_suite_test.go b/pkg/internal/testing/controlplane/controlplane_suite_test.go index 812fa9e31c..0042acd2c4 100644 --- a/pkg/internal/testing/controlplane/controlplane_suite_test.go +++ b/pkg/internal/testing/controlplane/controlplane_suite_test.go @@ -21,8 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Control Plane Standup Unit Tests" @@ -32,7 +30,3 @@ func TestIntegration(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/internal/testing/process/process_suite_test.go b/pkg/internal/testing/process/process_suite_test.go index 9832534448..428f1e3148 100644 --- a/pkg/internal/testing/process/process_suite_test.go +++ b/pkg/internal/testing/process/process_suite_test.go @@ -21,8 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Envtest Process Launcher Suite" @@ -32,7 +30,3 @@ func TestInternal(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/log/log_suite_test.go b/pkg/log/log_suite_test.go index 3abca610ad..a4db38c605 100644 --- a/pkg/log/log_suite_test.go +++ b/pkg/log/log_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Log Suite" @@ -30,7 +29,3 @@ func TestSource(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/log/zap/zap_suite_test.go b/pkg/log/zap/zap_suite_test.go index 86cd0d61fa..d237a19077 100644 --- a/pkg/log/zap/zap_suite_test.go +++ b/pkg/log/zap/zap_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Zap Log Suite" @@ -30,7 +29,3 @@ func TestSource(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/manager/manager_suite_test.go b/pkg/manager/manager_suite_test.go index 73fe2406aa..48d0a128f6 100644 --- a/pkg/manager/manager_suite_test.go +++ b/pkg/manager/manager_suite_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/metrics" @@ -81,7 +80,3 @@ var _ = AfterSuite(func() { // Put the DefaultBindAddress back metrics.DefaultBindAddress = ":8080" }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/manager/signals/signals_suite_test.go b/pkg/manager/signals/signals_suite_test.go index 5bc6c8c5d3..262795cc3c 100644 --- a/pkg/manager/signals/signals_suite_test.go +++ b/pkg/manager/signals/signals_suite_test.go @@ -22,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Runtime Signal Suite" @@ -35,7 +34,3 @@ func TestSource(t *testing.T) { var _ = BeforeSuite(func() { signal.Reset() }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/predicate/predicate_suite_test.go b/pkg/predicate/predicate_suite_test.go index ff6da96d7a..243cdf67cf 100644 --- a/pkg/predicate/predicate_suite_test.go +++ b/pkg/predicate/predicate_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -36,7 +35,3 @@ func TestPredicate(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/reconcile/reconcile_suite_test.go b/pkg/reconcile/reconcile_suite_test.go index c8e5586005..ce6ccfe756 100644 --- a/pkg/reconcile/reconcile_suite_test.go +++ b/pkg/reconcile/reconcile_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -36,7 +35,3 @@ func TestReconcile(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/runtime/inject/inject_suite_test.go b/pkg/runtime/inject/inject_suite_test.go index 3d49744d34..6456db4967 100644 --- a/pkg/runtime/inject/inject_suite_test.go +++ b/pkg/runtime/inject/inject_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Runtime Injection Suite" @@ -30,7 +29,3 @@ func TestSource(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/scheme/scheme_suite_test.go b/pkg/scheme/scheme_suite_test.go index 6d7d8b7d66..4336b69710 100644 --- a/pkg/scheme/scheme_suite_test.go +++ b/pkg/scheme/scheme_suite_test.go @@ -21,8 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" ) const suiteName = "Scheme Suite" @@ -31,7 +29,3 @@ func TestScheme(t *testing.T) { RegisterFailHandler(Fail) RunSpecs(t, suiteName) } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/source/internal/internal_suite_test.go b/pkg/source/internal/internal_suite_test.go index 17c64eda2d..60ecbbbb9d 100644 --- a/pkg/source/internal/internal_suite_test.go +++ b/pkg/source/internal/internal_suite_test.go @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -36,7 +35,3 @@ func TestInternal(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/source/source_suite_test.go b/pkg/source/source_suite_test.go index 04bef13469..6603d31fb0 100644 --- a/pkg/source/source_suite_test.go +++ b/pkg/source/source_suite_test.go @@ -26,7 +26,6 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -71,7 +70,3 @@ var _ = AfterSuite(func() { cancel() Expect(testenv.Stop()).To(Succeed()) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/webhook/admission/admission_suite_test.go b/pkg/webhook/admission/admission_suite_test.go index 0cf9a1e7e8..e02983f622 100644 --- a/pkg/webhook/admission/admission_suite_test.go +++ b/pkg/webhook/admission/admission_suite_test.go @@ -22,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -37,7 +36,3 @@ func TestAdmissionWebhook(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/webhook/authentication/authentication_suite_test.go b/pkg/webhook/authentication/authentication_suite_test.go index a2f22264cf..ba5372ce34 100644 --- a/pkg/webhook/authentication/authentication_suite_test.go +++ b/pkg/webhook/authentication/authentication_suite_test.go @@ -22,7 +22,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -37,7 +36,3 @@ func TestAuthenticationWebhook(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/webhook/conversion/conversion_suite_test.go b/pkg/webhook/conversion/conversion_suite_test.go index 442357ad38..c75da0578b 100644 --- a/pkg/webhook/conversion/conversion_suite_test.go +++ b/pkg/webhook/conversion/conversion_suite_test.go @@ -5,7 +5,7 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 + http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, @@ -21,7 +21,6 @@ import ( . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -36,7 +35,3 @@ func TestConversionWebhook(t *testing.T) { var _ = BeforeSuite(func() { logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true))) }) - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -}) diff --git a/pkg/webhook/webhook_suite_test.go b/pkg/webhook/webhook_suite_test.go index b5d486a280..cc4357b8d6 100644 --- a/pkg/webhook/webhook_suite_test.go +++ b/pkg/webhook/webhook_suite_test.go @@ -27,7 +27,6 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - "sigs.k8s.io/controller-runtime/pkg/envtest/printer" logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" ) @@ -106,7 +105,3 @@ func initializeWebhookInEnvironment() { }, } } - -var _ = ReportAfterSuite("Report to Prow", func(report Report) { - printer.AddReport(report, suiteName) -})