remove prow ginkgo helper

kubernetes-sigs · Aug 17, 2022 · 4b246c2 · 4b246c2
1 parent ccc5b15
commit 4b246c2
Show file tree

Hide file tree

Showing 39 changed files with 34 additions and 213 deletions.
diff --git 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
@@ -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 '<failure type="Failure">' ${ARTIFACTS}/*; then exit 1; fi
+  mv ./junit-report.xml ${ARTIFACTS}/junit-report.xml
 fi
+
+# if [[ -n ${ARTIFACTS:-} ]]; then
+#   if grep -Rin '<failure type="Failure">' ${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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
-})