Skip to content

Commit 3b34d95

Browse files
schrejschrej
committed
remove prow ginkgo helper
1 parent ccc5b15 commit 3b34d95

39 files changed

+16
-243
lines changed

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77

88
# Test binary, build with `go test -c`
99
*.test
10-
test-report.xml
10+
11+
junit-report.xml
1112

1213
# Output of the go coverage tool, specifically when used with LiteIDE
1314
*.out

‎hack/test-all.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,19 @@ source ${hack_dir}/common.sh
2626

2727
header_text "running tests using ginkgo"
2828

29-
${hack_dir}/tools/bin/ginkgo --junit-report test-report.xml --keep-going --race -r ${P_FLAG} ${MOD_OPT}
29+
if [[ -n ${ARTIFACTS:-} ]]; then
30+
GINKGO_ARGS="--junit-report junit-report.xml"
31+
fi
32+
33+
ginkgo_result=0
34+
${hack_dir}/tools/bin/ginkgo --keep-going --race -r ${GINKGO_ARGS} ${P_FLAG} ${MOD_OPT} || ginkgo_result=$?
3035

3136
if [[ -n ${ARTIFACTS:-} ]]; then
32-
if grep -Rin '<failure type="Failure">' ${ARTIFACTS}/*; then exit 1; fi
37+
mv ./junit-report.xml ${ARTIFACTS}/junit-report.xml
3338
fi
39+
40+
# if [[ -n ${ARTIFACTS:-} ]]; then
41+
# if grep -Rin '<failure type="Failure">' ${ARTIFACTS}/*; then exit 1; fi
42+
# fi
43+
44+
exit $ginkgo_result

‎pkg/builder/builder_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import (
2828
"k8s.io/client-go/rest"
2929

3030
"sigs.k8s.io/controller-runtime/pkg/envtest"
31-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3231
"sigs.k8s.io/controller-runtime/pkg/internal/testing/addr"
3332
logf "sigs.k8s.io/controller-runtime/pkg/log"
3433
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -76,10 +75,6 @@ var _ = AfterSuite(func() {
7675
webhook.DefaultPort = 9443
7776
})
7877

79-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
80-
printer.AddReport(report, suiteName)
81-
})
82-
8378
func addCRDToEnvironment(env *envtest.Environment, gvks ...schema.GroupVersionKind) {
8479
for _, gvk := range gvks {
8580
plural, singular := meta.UnsafeGuessKindToResource(gvk)

‎pkg/cache/cache_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/rest"
2626
"sigs.k8s.io/controller-runtime/pkg/envtest"
27-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2827
logf "sigs.k8s.io/controller-runtime/pkg/log"
2928
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3029
)
@@ -56,7 +55,3 @@ var _ = BeforeSuite(func() {
5655
var _ = AfterSuite(func() {
5756
Expect(testenv.Stop()).To(Succeed())
5857
})
59-
60-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
61-
printer.AddReport(report, suiteName)
62-
})

‎pkg/cache/internal/internal_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121

2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2524
)
2625

2726
const suiteName = "Cache Internal Suite"
@@ -30,7 +29,3 @@ func TestSource(t *testing.T) {
3029
RegisterFailHandler(Fail)
3130
RunSpecs(t, suiteName)
3231
}
33-
34-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
35-
printer.AddReport(report, suiteName)
36-
})

‎pkg/certwatcher/certwatcher_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
. "github.com/onsi/ginkgo/v2"
2424
. "github.com/onsi/gomega"
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625
logf "sigs.k8s.io/controller-runtime/pkg/log"
2726
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2827
)
@@ -47,7 +46,3 @@ var _ = AfterSuite(func() {
4746
_ = os.Remove(file)
4847
}
4948
})
50-
51-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
52-
printer.AddReport(report, suiteName)
53-
})

‎pkg/client/apiutil/apiutil_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/rest"
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625

2726
logf "sigs.k8s.io/controller-runtime/pkg/log"
2827
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -43,7 +42,3 @@ var _ = BeforeSuite(func() {
4342
// for things that technically need a rest.Config for defaulting, but don't actually use them
4443
cfg = &rest.Config{}
4544
})
46-
47-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
48-
printer.AddReport(report, suiteName)
49-
})

‎pkg/client/client_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"k8s.io/client-go/rest"
2727
"sigs.k8s.io/controller-runtime/examples/crd/pkg"
2828
"sigs.k8s.io/controller-runtime/pkg/envtest"
29-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3029

3130
logf "sigs.k8s.io/controller-runtime/pkg/log"
3231
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -61,7 +60,3 @@ var _ = BeforeSuite(func() {
6160
var _ = AfterSuite(func() {
6261
Expect(testenv.Stop()).To(Succeed())
6362
})
64-
65-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
66-
printer.AddReport(report, suiteName)
67-
})

‎pkg/client/config/config_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
2424

25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2625
logf "sigs.k8s.io/controller-runtime/pkg/log"
2726
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2827
)
@@ -37,7 +36,3 @@ func TestConfig(t *testing.T) {
3736
var _ = BeforeSuite(func() {
3837
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
3938
})
40-
41-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
42-
printer.AddReport(report, suiteName)
43-
})

‎pkg/client/fake/client_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121

2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2524

2625
logf "sigs.k8s.io/controller-runtime/pkg/log"
2726
"sigs.k8s.io/controller-runtime/pkg/log/zap"
@@ -37,7 +36,3 @@ func TestSource(t *testing.T) {
3736
var _ = BeforeSuite(func() {
3837
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
3938
})
40-
41-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
42-
printer.AddReport(report, suiteName)
43-
})

‎pkg/cluster/cluster_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"k8s.io/client-go/kubernetes"
2626
"k8s.io/client-go/rest"
2727
"sigs.k8s.io/controller-runtime/pkg/envtest"
28-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2928
logf "sigs.k8s.io/controller-runtime/pkg/log"
3029
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3130
)
@@ -69,7 +68,3 @@ var _ = BeforeSuite(func() {
6968
var _ = AfterSuite(func() {
7069
Expect(testenv.Stop()).To(Succeed())
7170
})
72-
73-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
74-
printer.AddReport(report, suiteName)
75-
})

‎pkg/config/config_suite_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import (
2121

2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2624
)
2725

2826
const suiteName = "Config Suite"
@@ -31,7 +29,3 @@ func TestScheme(t *testing.T) {
3129
RegisterFailHandler(Fail)
3230
RunSpecs(t, suiteName)
3331
}
34-
35-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
36-
printer.AddReport(report, suiteName)
37-
})

‎pkg/controller/controller_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929

3030
"sigs.k8s.io/controller-runtime/pkg/controller/controllertest"
3131
"sigs.k8s.io/controller-runtime/pkg/envtest"
32-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
3332
logf "sigs.k8s.io/controller-runtime/pkg/log"
3433
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3534
"sigs.k8s.io/controller-runtime/pkg/metrics"
@@ -91,7 +90,3 @@ var _ = AfterSuite(func() {
9190
// Put the DefaultBindAddress back
9291
metrics.DefaultBindAddress = ":8080"
9392
})
94-
95-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
96-
printer.AddReport(report, suiteName)
97-
})

‎pkg/controller/controllerutil/controllerutil_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"k8s.io/client-go/rest"
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
"sigs.k8s.io/controller-runtime/pkg/envtest"
28-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2928
)
3029

3130
const suiteName = "Controllerutil Suite"
@@ -54,7 +53,3 @@ var _ = BeforeSuite(func() {
5453
var _ = AfterSuite(func() {
5554
Expect(testenv.Stop()).To(Succeed())
5655
})
57-
58-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
59-
printer.AddReport(report, suiteName)
60-
})

‎pkg/envtest/envtest_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
admissionv1 "k8s.io/api/admissionregistration/v1"
2525
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2626

27-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2827
logf "sigs.k8s.io/controller-runtime/pkg/log"
2928
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3029
)
@@ -135,7 +134,3 @@ func initializeWebhookInEnvironment() {
135134
var _ = AfterSuite(func() {
136135
Expect(env.Stop()).NotTo(HaveOccurred())
137136
})
138-
139-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
140-
printer.AddReport(report, suiteName)
141-
})

‎pkg/envtest/printer/prow.go

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎pkg/finalizer/finalizer_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
"sigs.k8s.io/controller-runtime/pkg/client"
13-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
1413
)
1514

1615
type mockFinalizer struct {
@@ -216,7 +215,3 @@ var _ = Describe("TestFinalizer", func() {
216215
})
217216
})
218217
})
219-
220-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
221-
printer.AddReport(report, suiteName)
222-
})

‎pkg/handler/eventhandler_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
. "github.com/onsi/gomega"
2424
"k8s.io/client-go/rest"
2525
"sigs.k8s.io/controller-runtime/pkg/envtest"
26-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2726
logf "sigs.k8s.io/controller-runtime/pkg/log"
2827
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2928
)
@@ -50,7 +49,3 @@ var _ = BeforeSuite(func() {
5049
var _ = AfterSuite(func() {
5150
Expect(testenv.Stop()).To(Succeed())
5251
})
53-
54-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
55-
printer.AddReport(report, suiteName)
56-
})

‎pkg/healthz/healthz_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121

2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2524
logf "sigs.k8s.io/controller-runtime/pkg/log"
2625
"sigs.k8s.io/controller-runtime/pkg/log/zap"
2726
)
@@ -36,7 +35,3 @@ func TestHealthz(t *testing.T) {
3635
var _ = BeforeSuite(func() {
3736
logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
3837
})
39-
40-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
41-
printer.AddReport(report, suiteName)
42-
})

‎pkg/internal/controller/controller_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/rest"
2626
"sigs.k8s.io/controller-runtime/pkg/envtest"
27-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2827
logf "sigs.k8s.io/controller-runtime/pkg/log"
2928
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3029
)
@@ -56,7 +55,3 @@ var _ = BeforeSuite(func() {
5655
var _ = AfterSuite(func() {
5756
Expect(testenv.Stop()).To(Succeed())
5857
})
59-
60-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
61-
printer.AddReport(report, suiteName)
62-
})

‎pkg/internal/recorder/recorder_suite_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/client-go/kubernetes"
2525
"k8s.io/client-go/rest"
2626
"sigs.k8s.io/controller-runtime/pkg/envtest"
27-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2827
logf "sigs.k8s.io/controller-runtime/pkg/log"
2928
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3029
)
@@ -56,7 +55,3 @@ var _ = BeforeSuite(func() {
5655
var _ = AfterSuite(func() {
5756
Expect(testenv.Stop()).To(Succeed())
5857
})
59-
60-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
61-
printer.AddReport(report, suiteName)
62-
})

‎pkg/internal/testing/addr/addr_suite_test.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ import (
2121

2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
25-
"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
2624
)
2725

2826
const suiteName = "Addr Suite"
@@ -32,7 +30,3 @@ func TestAddr(t *testing.T) {
3230
RegisterFailHandler(Fail)
3331
RunSpecs(t, suiteName)
3432
}
35-
36-
var _ = ReportAfterSuite("Report to Prow", func(report Report) {
37-
printer.AddReport(report, suiteName)
38-
})

0 commit comments

Comments
 (0)