tests/tools: update ginkgo

Update the version of ginkgo that we build for use by our e2e tests.

Signed-off-by: Nalin Dahyabhai <[email protected]>

Author: nalind

tests/tools/Makefile

@@ -22,7 +22,7 @@ $(BUILDDIR): \
 	$(BUILDDIR)/golangci-lint
 
 $(BUILDDIR)/ginkgo:
-	$(GO_BUILD) -o $@ ./vendor/github.com/onsi/ginkgo/ginkgo
+	$(GO_BUILD) -o $@ ./vendor/github.com/onsi/ginkgo/v2/ginkgo
 
 $(BUILDDIR)/go-md2man:
 	$(GO_BUILD) -o $@ ./vendor/github.com/cpuguy83/go-md2man/v2

tests/tools/go.mod

@@ -1,11 +1,12 @@
 module github.com/containers/buildah/tests/tools
 
-go 1.17
+go 1.22.0
 
 require (
 	github.com/cpuguy83/go-md2man/v2 v2.0.2
 	github.com/golangci/golangci-lint v1.51.2
-	github.com/onsi/ginkgo v1.16.5
+	github.com/onsi/ginkgo/v2 v2.8.0
+	github.com/onsi/gomega v1.26.0
 )
 
 require (
@@ -67,6 +68,7 @@ require (
 	github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect
 	github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
 	github.com/gordonklaus/ineffassign v0.0.0-20230107090616-13ace0543b28 // indirect
 	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
 	github.com/gostaticanalysis/comment v1.4.2 // indirect
@@ -111,7 +113,6 @@ require (
 	github.com/nishanths/exhaustive v0.9.5 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect
 	github.com/nunnatsa/ginkgolinter v0.8.1 // indirect
-	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
 	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.0.5 // indirect
@@ -170,13 +171,13 @@ require (
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
 	golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9 // indirect
 	golang.org/x/mod v0.8.0 // indirect
+	golang.org/x/net v0.6.0 // indirect
 	golang.org/x/sync v0.1.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/tools v0.6.0 // indirect
 	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
-	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	honnef.co/go/tools v0.4.2 // indirect

tests/tools/go.sum

@@ -9,5 +9,6 @@ package tools
 import (
 	_ "github.com/cpuguy83/go-md2man/v2"
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint"
-	_ "github.com/onsi/ginkgo/ginkgo/v2"
+	_ "github.com/onsi/ginkgo/v2/ginkgo"
+	_ "github.com/onsi/gomega"
 )