Merge pull request #18163 from Luap99/ginkgo-v2

update to ginkgo v2

.cirrus.yml

@@ -574,7 +574,7 @@ local_integration_test_task: &local_integration_test_task
         - unit_test
     matrix: *platform_axis
     gce_instance: *standardvm
-    timeout_in: 90m
+    timeout_in: 50m
     env:
         TEST_FLAVOR: int
     clone_script: *get_gosrc
@@ -620,7 +620,7 @@ container_integration_test_task:
               CI_DESIRED_RUNTIME: crun
               CI_DESIRED_NETWORK: cni
     gce_instance: *standardvm
-    timeout_in: 90m
+    timeout_in: 50m
     env:
         TEST_FLAVOR: int
         TEST_ENVIRON: container
@@ -639,7 +639,7 @@ rootless_integration_test_task:
     depends_on: *build_unit
     matrix: *platform_axis
     gce_instance: *standardvm
-    timeout_in: 90m
+    timeout_in: 50m
     env:
         TEST_FLAVOR: int
         PRIV_NAME: rootless

Makefile

@@ -126,8 +126,7 @@ LIBSECCOMP_COMMIT := v2.3.3
 GINKGOTIMEOUT ?= -timeout=90m
 # By default, run test/e2e
 GINKGOWHAT ?= test/e2e/.
-# By default, run tests in parallel across 3 nodes.
-GINKGONODES ?= 3
+GINKGO_PARALLEL=y
 GINKGO ?= ./test/tools/build/ginkgo
 
 # Conditional required to produce empty-output if binary not built yet.
@@ -542,11 +541,11 @@ localunit: test/goecho/goecho test/version/version
 	UNIT=1 $(GINKGO) \
 		-r \
 		$(TESTFLAGS) \
-		--skipPackage test/e2e,pkg/apparmor,pkg/bindings,hack,pkg/machine/e2e \
+		--skip-package test/e2e,pkg/bindings,hack,pkg/machine/e2e \
 		--cover \
 		--covermode atomic \
 		--coverprofile coverprofile \
-		--outputdir ${COVERAGE_PATH} \
+		--output-dir ${COVERAGE_PATH} \
 		--tags "$(BUILDTAGS)" \
 		--succinct
 	$(GO) tool cover -html=${COVERAGE_PATH}/coverprofile -o ${COVERAGE_PATH}/coverage.html
@@ -558,8 +557,8 @@ test: localunit localintegration remoteintegration localsystem remotesystem  ##
 
 .PHONY: ginkgo-run
 ginkgo-run: .install.ginkgo
-	ACK_GINKGO_RC=true $(GINKGO) version
-	ACK_GINKGO_RC=true $(GINKGO) -v $(TESTFLAGS) -tags "$(TAGS) remote" $(GINKGOTIMEOUT) -cover -flakeAttempts 3 -progress -trace -noColor -nodes $(GINKGONODES) -debug $(GINKGOWHAT) $(HACK)
+	$(GINKGO) version
+	$(GINKGO) -vv $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --flake-attempts 3 --trace --no-color $(if $(findstring y,$(GINKGO_PARALLEL)),-p,) $(GINKGOWHAT) $(HACK)
 
 .PHONY: ginkgo
 ginkgo:
@@ -571,7 +570,7 @@ ginkgo-remote:
 
 .PHONY: testbindings
 testbindings: .install.ginkgo
-	ACK_GINKGO_RC=true $(GINKGO) -v $(TESTFLAGS) -tags "$(TAGS) remote" $(GINKGOTIMEOUT) -progress -trace -noColor -debug -timeout 30m  -v -r ./pkg/bindings/test
+	$(GINKGO) -v $(TESTFLAGS) --tags "$(TAGS) remote" $(GINKGOTIMEOUT) --trace --no-color --timeout 30m  -v -r ./pkg/bindings/test
 
 .PHONY: localintegration
 localintegration: test-binaries ginkgo
@@ -581,15 +580,7 @@ remoteintegration: test-binaries ginkgo-remote
 
 .PHONY: localmachine
 localmachine: test-binaries .install.ginkgo
-	$(MAKE) ginkgo-run GINKGONODES=1 GINKGOWHAT=pkg/machine/e2e/. HACK=
-
-.PHONY: localbenchmarks
-localbenchmarks: install.tools test-binaries
-	PATH=$(PATH):$(shell pwd)/hack ACK_GINKGO_RC=true $(GINKGO) \
-		      -focus "Podman Benchmark Suite" \
-		      -tags "$(BUILDTAGS) benchmarks" -noColor \
-		      -noisySkippings=false -noisyPendings=false \
-		      test/e2e/.
+	$(MAKE) ginkgo-run GINKGO_PARALLEL=n GINKGOWHAT=pkg/machine/e2e/. HACK=
 
 .PHONY: localsystem
 localsystem:

contrib/cirrus/lib.sh

@@ -335,37 +335,3 @@ remove_packaged_podman_files() {
     # Be super extra sure and careful vs performant and completely safe
     sync && echo 3 > /proc/sys/vm/drop_caches || true
 }
-
-# Execute make localbenchmarks in $CIRRUS_WORKING_DIR/data
-# for preserving as a task artifact.
-localbenchmarks() {
-    local datadir envnames envname
-    req_env_vars DISTRO_NV PODBIN_NAME PRIV_NAME TEST_ENVIRON TEST_FLAVOR
-    req_env_vars VM_IMAGE_NAME EC2_INST_TYPE
-
-    datadir=$CIRRUS_WORKING_DIR/data
-    mkdir -p $datadir
-
-    envnames=$(passthrough_envars | sort);
-    (
-      echo "# Env. var basis for benchmarks benchmarks."
-      for envname in $envnames; do
-        printf "$envname=%q\n" "${!envname}"
-      done
-
-      echo "# Machine details for data-comparison sake, not actual env. vars."
-      # Checked above in req_env_vars
-      # shellcheck disable=SC2154
-      echo "\
-BENCH_ENV_VER=1
-CPUTOTAL=$(grep -ce '^processor' /proc/cpuinfo)
-INST_TYPE=$EC2_INST_TYPE
-MEMTOTALKB=$(awk -F: '$1 == "MemTotal" { print $2 }' </proc/meminfo | sed -e "s/^ *//" | cut -d ' ' -f 1)
-UNAME_R=$(uname -r)
-UNAME_M=$(uname -m)
-"
-    ) > $datadir/benchmarks.env
-    make localbenchmarks | tee $datadir/benchmarks.raw
-    msg "Processing raw benchmarks output"
-    hack/parse-localbenchmarks < $datadir/benchmarks.raw | tee $datadir/benchmarks.csv
-}