Skip to content

Commit

Permalink
chore: Remove custom reporters from functional tests
Browse files Browse the repository at this point in the history
The custom reporters are no longer used in ginkgo v2.

Signed-off-by: Andrej Krejcir <[email protected]>
akrejcir committed Jan 23, 2025
1 parent d82ef18 commit 0c2b3d7
Showing 9 changed files with 1 addition and 670 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -33,7 +33,6 @@ require (
kubevirt.io/api v1.4.0
kubevirt.io/containerized-data-importer-api v1.61.0
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4
kubevirt.io/qe-tools v0.1.8
kubevirt.io/ssp-operator/api v0.0.0
kubevirt.io/vm-console-proxy/api v0.7.0
sigs.k8s.io/controller-runtime v0.20.0
3 changes: 0 additions & 3 deletions go.sum
Original file line number Diff line number Diff line change
@@ -320,7 +320,6 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
@@ -863,8 +862,6 @@ kubevirt.io/containerized-data-importer-api v1.61.0 h1:zqgn4/ftAPRK4ljZDZcgRiW25
kubevirt.io/containerized-data-importer-api v1.61.0/go.mod h1:SDJjLGhbPyayDqAqawcGmVNapBp0KodOQvhKPLVGCQU=
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4 h1:fZYvD3/Vnitfkx6IJxjLAk8ugnZQ7CXVYcRfkSKmuZY=
kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4/go.mod h1:018lASpFYBsYN6XwmA2TIrPCx6e0gviTd/ZNtSitKgc=
kubevirt.io/qe-tools v0.1.8 h1:Ar7qicmzHdd+Ia+6rjHDg3D7GReIyq7QFXoC4F7TjhQ=
kubevirt.io/qe-tools v0.1.8/go.mod h1:+Tr/WZGHIDQa/4pQgzM7+4J6YeVbUWAXESXtL2/zxqc=
kubevirt.io/vm-console-proxy/api v0.7.0 h1:yhzTtywJDqDx3ddIDhuMmN9O19EdGZS0NDqtGwEwk9c=
kubevirt.io/vm-console-proxy/api v0.7.0/go.mod h1:7q967W73c6/Iczl3xJkOjQOASAJ2wXBTEbCbiqD9bXE=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
14 changes: 1 addition & 13 deletions tests/tests_suite_test.go
Original file line number Diff line number Diff line change
@@ -11,7 +11,6 @@ import (
. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"

ginkgo_reporters "github.com/onsi/ginkgo/v2/reporters"
osconfv1 "github.com/openshift/api/config/v1"
routev1 "github.com/openshift/api/route/v1"
secv1 "github.com/openshift/api/security/v1"
@@ -37,7 +36,6 @@ import (
instancetypev1beta1 "kubevirt.io/api/instancetype/v1beta1"
cdiv1beta1 "kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1"
lifecycleapi "kubevirt.io/controller-lifecycle-operator-sdk/api"
qe_reporters "kubevirt.io/qe-tools/pkg/ginkgo-reporters"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -602,18 +600,8 @@ func triggerReconciliation() {
}

func TestFunctional(t *testing.T) {
var reporters []Reporter

if qe_reporters.JunitOutput != "" {
reporters = append(reporters, ginkgo_reporters.NewJUnitReporter(qe_reporters.JunitOutput))
}

if qe_reporters.Polarion.Run {
reporters = append(reporters, &qe_reporters.Polarion)
}

RegisterFailHandler(Fail)
RunSpecsWithDefaultAndCustomReporters(t, "Functional test suite", reporters)
RunSpecs(t, "Functional test suite")
}

func retrieveNodeArchitecture() string {
201 changes: 0 additions & 201 deletions vendor/kubevirt.io/qe-tools/LICENSE

This file was deleted.

36 changes: 0 additions & 36 deletions vendor/kubevirt.io/qe-tools/pkg/ginkgo-reporters/README.md

This file was deleted.

36 changes: 0 additions & 36 deletions vendor/kubevirt.io/qe-tools/pkg/ginkgo-reporters/junit_reporter.go

This file was deleted.

271 changes: 0 additions & 271 deletions vendor/kubevirt.io/qe-tools/pkg/ginkgo-reporters/polarion_reporter.go

This file was deleted.

105 changes: 0 additions & 105 deletions vendor/kubevirt.io/qe-tools/pkg/polarion-xml/polarion_xml.go

This file was deleted.

4 changes: 0 additions & 4 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
@@ -1038,10 +1038,6 @@ kubevirt.io/containerized-data-importer-api/pkg/apis/core/v1beta1
# kubevirt.io/controller-lifecycle-operator-sdk/api v0.2.4
## explicit; go 1.17
kubevirt.io/controller-lifecycle-operator-sdk/api
# kubevirt.io/qe-tools v0.1.8
## explicit; go 1.16
kubevirt.io/qe-tools/pkg/ginkgo-reporters
kubevirt.io/qe-tools/pkg/polarion-xml
# kubevirt.io/ssp-operator/api v0.0.0 => ./api
## explicit; go 1.23.2
kubevirt.io/ssp-operator/api/v1beta2

0 comments on commit 0c2b3d7

Please sign in to comment.