From 100b8e564f8386fafa4fd0bff91f36bbd1255061 Mon Sep 17 00:00:00 2001 From: zhangzujian Date: Tue, 19 Mar 2024 04:24:42 +0000 Subject: [PATCH] bump github.com/onsi/ginkgo/v2 to v2.17.0 Signed-off-by: zhangzujian --- Makefile | 2 +- Makefile.e2e | 26 ++++++++++++++------------ go.mod | 4 ++-- go.sum | 8 ++++---- 4 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 818b12fa70e..f881a9e758f 100644 --- a/Makefile +++ b/Makefile @@ -987,7 +987,7 @@ scan: .PHONY: ut ut: - ginkgo -mod=mod --show-node-events --poll-progress-after=60s -v test/unittest + ginkgo -mod=mod --show-node-events --poll-progress-after=60s $(GINKGO_OUTPUT_OPT) -v test/unittest go test ./pkg/... .PHONY: ipam-bench diff --git a/Makefile.e2e b/Makefile.e2e index 8b54e3329ec..2560237ba6d 100644 --- a/Makefile.e2e +++ b/Makefile.e2e @@ -50,8 +50,10 @@ K8S_CONFORMANCE_E2E_SKIP += "sig-network.*Networking.*Feature:SCTPConnectivity" K8S_CONFORMANCE_E2E_SKIP += "sig-network.*Services.*should serve endpoints on same port and different protocols" endif +GINKGO_OUTPUT_OPT = GINKGO_PARALLEL_OPT = -p ifeq ($(shell echo $${CI:-false}),true) +GINKGO_OUTPUT_OPT = --github-output GINKGO_PARALLEL_OPT = --procs $$(($$(nproc) * $(GINKGO_PARALLEL_MULTIPLIER))) endif @@ -81,7 +83,7 @@ e2e-build: .PHONY: k8s-conformance-e2e k8s-conformance-e2e: ginkgo build $(E2E_BUILD_FLAGS) ./test/e2e/k8s-network - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v --timeout=1h \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v --timeout=1h \ $(call ginkgo_option,focus,$(K8S_CONFORMANCE_E2E_FOCUS)) \ $(call ginkgo_option,skip,$(K8S_CONFORMANCE_E2E_SKIP)) \ ./test/e2e/k8s-network/k8s-network.test -- $(TEST_BIN_ARGS) @@ -89,7 +91,7 @@ k8s-conformance-e2e: .PHONY: k8s-netpol-e2e k8s-netpol-e2e: ginkgo build $(E2E_BUILD_FLAGS) ./test/e2e/k8s-network - ginkgo --randomize-all -v --timeout=2h \ + ginkgo $(GINKGO_OUTPUT_OPT) --randomize-all -v --timeout=2h \ $(call ginkgo_option,focus,$(K8S_NETPOL_E2E_FOCUS)) \ $(call ginkgo_option,skip,$(K8S_NETPOL_E2E_SKIP)) \ ./test/e2e/k8s-network/k8s-network.test -- $(TEST_BIN_ARGS) @@ -114,7 +116,7 @@ kube-ovn-conformance-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v --timeout=30m \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v --timeout=30m \ --focus=CNI:Kube-OVN ./test/e2e/kube-ovn/kube-ovn.test -- $(TEST_BIN_ARGS) .PHONY: kube-ovn-ic-conformance-e2e @@ -123,7 +125,7 @@ kube-ovn-ic-conformance-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/ovn-ic/ovn-ic.test -- $(TEST_BIN_ARGS) .PHONY: kube-ovn-submariner-conformance-e2e @@ -138,7 +140,7 @@ kube-ovn-lb-svc-conformance-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/lb-svc/lb-svc.test -- $(TEST_BIN_ARGS) .PHONY: vip-conformance-e2e @@ -147,7 +149,7 @@ vip-conformance-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/vip/vip.test -- $(TEST_BIN_ARGS) .PHONY: iptables-vpc-nat-gw-conformance-e2e @@ -156,7 +158,7 @@ iptables-vpc-nat-gw-conformance-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/iptables-vpc-nat-gw/iptables-vpc-nat-gw.test -- $(TEST_BIN_ARGS) .PHONY: ovn-vpc-nat-gw-conformance-e2e @@ -165,7 +167,7 @@ ovn-vpc-nat-gw-conformance-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/ovn-vpc-nat-gw/ovn-vpc-nat-gw.test -- $(TEST_BIN_ARGS) .PHONY: kube-ovn-ha-e2e @@ -174,7 +176,7 @@ kube-ovn-ha-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/ha/ha.test -- $(TEST_BIN_ARGS) .PHONY: kube-ovn-security-e2e @@ -183,7 +185,7 @@ kube-ovn-security-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/security/security.test -- $(TEST_BIN_ARGS) .PHONY: kube-ovn-kubevirt-e2e @@ -192,7 +194,7 @@ kube-ovn-kubevirt-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/kubevirt/kubevirt.test -- $(TEST_BIN_ARGS) .PHONY: kube-ovn-webhook-e2e @@ -201,7 +203,7 @@ kube-ovn-webhook-e2e: E2E_BRANCH=$(E2E_BRANCH) \ E2E_IP_FAMILY=$(E2E_IP_FAMILY) \ E2E_NETWORK_MODE=$(E2E_NETWORK_MODE) \ - ginkgo $(GINKGO_PARALLEL_OPT) --randomize-all -v \ + ginkgo $(GINKGO_OUTPUT_OPT) $(GINKGO_PARALLEL_OPT) --randomize-all -v \ --focus=CNI:Kube-OVN ./test/e2e/webhook/webhook.test -- $(TEST_BIN_ARGS) .PHONY: kubectl-ko-log diff --git a/go.mod b/go.mod index 295b5adfa03..82ee2810bd2 100644 --- a/go.mod +++ b/go.mod @@ -25,8 +25,8 @@ require ( github.com/kubeovn/gonetworkmanager/v2 v2.0.0-20230905082151-e28c4d73a589 github.com/mdlayher/arp v0.0.0-20220512170110-6706a2966875 github.com/moby/sys/mountinfo v0.7.1 - github.com/onsi/ginkgo/v2 v2.16.0 - github.com/onsi/gomega v1.31.1 + github.com/onsi/ginkgo/v2 v2.17.0 + github.com/onsi/gomega v1.32.0 github.com/osrg/gobgp/v3 v3.24.0 github.com/ovn-org/libovsdb v0.0.0-20230711201130-6785b52d4020 github.com/parnurzeal/gorequest v0.3.0 diff --git a/go.sum b/go.sum index ddf7e6a6de1..2c4d7abe7a0 100644 --- a/go.sum +++ b/go.sum @@ -1844,8 +1844,8 @@ github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3Ro github.com/onsi/ginkgo/v2 v2.9.7/go.mod h1:cxrmXWykAwTwhQsJOPfdIDiJ+l2RYq7U8hFU+M/1uw0= github.com/onsi/ginkgo/v2 v2.11.0/go.mod h1:ZhrRA5XmEE3x3rhlzamx/JJvujdZoJ2uvgI7kR0iZvM= github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= -github.com/onsi/ginkgo/v2 v2.16.0 h1:7q1w9frJDzninhXxjZd+Y/x54XNjG/UlRLIYPZafsPM= -github.com/onsi/ginkgo/v2 v2.16.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= +github.com/onsi/ginkgo/v2 v2.17.0 h1:kdnunFXpBjbzN56hcJHrXZ8M+LOkenKA7NnBzTNigTI= +github.com/onsi/ginkgo/v2 v2.17.0/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY= @@ -1868,8 +1868,8 @@ github.com/onsi/gomega v1.27.7/go.mod h1:1p8OOlwo2iUUDsHnOrjE5UKYJ+e3W8eQ3qSlRah github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ= github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M= github.com/onsi/gomega v1.29.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= -github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= -github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=