Skip to content

Commit f190dde

Browse files
committed
Squashed commit of the following:
commit d9fcdae Merge: 6569b29 07f79d4 Author: weizhichen <[email protected]> Date: Tue Apr 4 08:36:31 2023 +0000 Merge branch 'master' of https://github.com/kubernetes-sigs/blob-csi-driver into e2e-test commit 6569b29 Author: weizhichen <[email protected]> Date: Mon Apr 3 11:37:40 2023 +0000 parallel again commit 9ed8a55 Merge: 551c409 a47bc07 Author: weizhichen <[email protected]> Date: Mon Apr 3 10:27:26 2023 +0000 Merge branch 'master' of https://github.com/kubernetes-sigs/blob-csi-driver into e2e-test commit 551c409 Author: weizhichen <[email protected]> Date: Mon Apr 3 10:21:04 2023 +0000 another flaky test commit 38e0b6a Author: weizhichen <[email protected]> Date: Mon Apr 3 08:46:01 2023 +0000 fix panic commit cce9102 Author: weizhichen <[email protected]> Date: Mon Apr 3 07:40:40 2023 +0000 flaky: e2e: fix pre-provisioned test commit 3b5a6ee Author: weizhichen <[email protected]> Date: Mon Apr 3 03:19:55 2023 +0000 framework init commit 6fa9cd4 Author: weizhichen <[email protected]> Date: Sun Apr 2 08:31:37 2023 +0000 flake attempts commit 7c752ae Author: weizhichen <[email protected]> Date: Sun Apr 2 03:29:32 2023 +0000 cancel parallel commit cffd14a Author: weizhichen <[email protected]> Date: Sun Apr 2 00:31:23 2023 +0000 flakeattempts commit c6a0266 Author: weizhichen <[email protected]> Date: Sat Apr 1 20:10:30 2023 +0000 make nfs test serial commit 9bba102 Author: weizhichen <[email protected]> Date: Sat Apr 1 01:46:32 2023 +0000 make private endpoint test serial commit fe1e3b8 Author: weizhichen <[email protected]> Date: Sat Apr 1 00:52:47 2023 +0000 output-interceptor-mode=none commit c4a3a91 Author: weizhichen <[email protected]> Date: Fri Mar 31 10:05:40 2023 +0000 no flake-attempts commit a94726a Author: weizhichen <[email protected]> Date: Fri Mar 31 09:59:57 2023 +0000 gomega success commit f9638e2 Author: weizhichen <[email protected]> Date: Fri Mar 31 09:27:02 2023 +0000 pass project root to e2e test commit 6b795c6 Author: weizhichen <[email protected]> Date: Fri Mar 31 07:48:30 2023 +0000 fix commit 2a14b30 Author: weizhichen <[email protected]> Date: Fri Mar 31 07:07:39 2023 +0000 fix restart driver commit 3553af8 Author: weizhichen <[email protected]> Date: Fri Mar 31 06:37:30 2023 +0000 fix pre_provisioned_provided_credentials_tester commit 0aa27dd Author: weizhichen <[email protected]> Date: Fri Mar 31 06:10:13 2023 +0000 move verify examples to ginkgo Node container commit 7ebd065 Author: weizhichen <[email protected]> Date: Fri Mar 31 04:58:18 2023 +0000 add flake-attempts commit 02a48ba Author: weizhichen <[email protected]> Date: Fri Mar 31 04:57:40 2023 +0000 Revert "use seed to repro" This reverts commit 1c5fea8. commit 1c5fea8 Author: weizhichen <[email protected]> Date: Thu Mar 30 16:27:03 2023 +0000 use seed to repro commit c52b495 Author: weizhichen <[email protected]> Date: Thu Mar 30 13:57:37 2023 +0000 fix: container name commit f1f55e4 Author: weizhichen <[email protected]> Date: Thu Mar 30 13:23:25 2023 +0000 fix dynamic inline volume and byok volume commit 0e4b11e Author: weizhichen <[email protected]> Date: Thu Mar 30 12:24:47 2023 +0000 revert --delete-namespace commit 7df5df4 Author: weizhichen <[email protected]> Date: Thu Mar 30 10:53:45 2023 +0000 fix: set framework flags commit 103840c Author: weizhichen <[email protected]> Date: Thu Mar 30 09:52:05 2023 +0000 set delete-namespace=false to avoid deleting ns which is used by other specs during parallel testing commit cda91f8 Author: weizhichen <[email protected]> Date: Thu Mar 30 08:36:47 2023 +0000 fix: should notify all goroutine channel by close commit 0aa42e6 Author: weizhichen <[email protected]> Date: Thu Mar 30 07:08:10 2023 +0000 fix NodeTimeout, need context commit 9c1fb1d Author: weizhichen <[email protected]> Date: Thu Mar 30 06:49:52 2023 +0000 fix defer cleanup order commit b4d44b2 Author: weizhichen <[email protected]> Date: Thu Mar 30 06:43:29 2023 +0000 add 10min GracePeriod for AfterSuite to avoid exit too quick commit 49fdec3 Author: weizhichen <[email protected]> Date: Thu Mar 30 05:22:55 2023 +0000 workaround the issue: kubernetes/kubernetes#107065 commit 30369fb Author: weizhichen <[email protected]> Date: Thu Mar 30 05:19:35 2023 +0000 fix restartDriverTest panic commit 67ff546 Author: weizhichen <[email protected]> Date: Thu Mar 30 05:00:44 2023 +0000 fix: dump namespace info commit 54a2d2f Author: weizhichen <[email protected]> Date: Thu Mar 30 04:25:58 2023 +0000 add log after driver pod is restarted commit fd32cab Author: weizhichen <[email protected]> Date: Thu Mar 30 03:04:35 2023 +0000 fix commit 7074288 Author: weizhichen <[email protected]> Date: Thu Mar 30 02:37:11 2023 +0000 adjust AccountCreationLeak check threshold commit b86e385 Author: weizhichen <[email protected]> Date: Thu Mar 30 02:08:51 2023 +0000 fix: reduce csi driver daemon restart times commit 63e820f Author: weizhichen <[email protected]> Date: Wed Mar 29 18:35:54 2023 +0000 fix pwd commit 65c8c04 Author: weizhichen <[email protected]> Date: Wed Mar 29 17:44:04 2023 +0000 fix: no log print out after blob daemonset is recreated commit b9754e4 Author: weizhichen <[email protected]> Date: Wed Mar 29 15:03:27 2023 +0000 fix commit a9b913d Author: weizhichen <[email protected]> Date: Wed Mar 29 14:55:11 2023 +0000 fix: createvolume and initialize volumeID in beforeeach commit e6aa3a8 Author: weizhichen <[email protected]> Date: Wed Mar 29 11:04:30 2023 +0000 fix: set azidentity.EnvironmentCredential for each process commit 2dd2015 Author: weizhichen <[email protected]> Date: Wed Mar 29 09:19:49 2023 +0000 fix init k8s client error commit b319406 Author: weizhichen <[email protected]> Date: Wed Mar 29 08:33:25 2023 +0000 fix BeforeSuite and AfterSuite commit 1496638 Author: weizhichen <[email protected]> Date: Wed Mar 29 07:49:07 2023 +0000 1. use e2e.test v1.26.0 2. upgrade ginkgo to v2.9.2 to use GinkgoHelper 3. add --fast-fail commit d6d05ea Author: weizhichen <[email protected]> Date: Wed Mar 29 03:49:51 2023 +0000 fix commit 6e6d71f Author: weizhichen <[email protected]> Date: Wed Mar 29 03:22:14 2023 +0000 test: speed up e2e test by running in parallel
1 parent 07f79d4 commit f190dde

File tree

249 files changed

+20650
-1383
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

249 files changed

+20650
-1383
lines changed

Makefile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ ifdef ENABLE_BLOBFUSE_PROXY
3434
override E2E_HELM_OPTIONS := $(E2E_HELM_OPTIONS) --set controller.logLevel=6 --set node.logLevel=6 --set node.enableBlobfuseProxy=true
3535
endif
3636
E2E_HELM_OPTIONS += ${EXTRA_HELM_OPTIONS}
37-
GINKGO_FLAGS = -ginkgo.v -ginkgo.timeout=2h
3837
GO111MODULE = on
3938
GOPATH ?= $(shell go env GOPATH)
4039
GOBIN ?= $(GOPATH)/bin
@@ -76,11 +75,11 @@ integration-test: blob
7675
go test -v -timeout=30m ./test/integration
7776

7877
.PHONY: e2e-test
79-
e2e-test:
78+
e2e-test: install-ginkgo
8079
if [ ! -z "$(EXTERNAL_E2E_TEST_BLOBFUSE)" ] || [ ! -z "$(EXTERNAL_E2E_TEST_BLOBFUSE_v2)" ] || [ ! -z "$(EXTERNAL_E2E_TEST_NFS)" ]; then \
8180
bash ./test/external-e2e/run.sh;\
8281
else \
83-
go test -v -timeout=0 ./test/e2e ${GINKGO_FLAGS};\
82+
ginkgo -p -vv --fail-fast --output-interceptor-mode=none --flake-attempts 2 ./test/e2e -- --project-root=$(shell pwd);\
8483
fi
8584

8685
.PHONY: e2e-bootstrap
@@ -96,6 +95,10 @@ e2e-bootstrap: install-helm
9695
install-helm:
9796
curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
9897

98+
.PHONY: install-ginkgo
99+
install-ginkgo:
100+
go install github.com/onsi/ginkgo/v2/[email protected]
101+
99102
.PHONY: e2e-teardown
100103
e2e-teardown:
101104
helm delete blob-csi-driver --namespace kube-system

go.mod

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ require (
1111
github.com/container-storage-interface/spec v1.7.0
1212
github.com/gofrs/uuid v4.2.0+incompatible // indirect
1313
github.com/golang/mock v1.6.0
14-
github.com/golang/protobuf v1.5.2
14+
github.com/golang/protobuf v1.5.3
1515
github.com/imdario/mergo v0.3.9 // indirect
1616
github.com/kubernetes-csi/csi-lib-utils v0.9.1
17-
github.com/onsi/gomega v1.25.0
17+
github.com/onsi/gomega v1.27.4
1818
github.com/pborman/uuid v1.2.0
1919
github.com/pelletier/go-toml v1.9.4
2020
github.com/stretchr/testify v1.8.2
21-
golang.org/x/net v0.7.0
21+
golang.org/x/net v0.8.0
2222
google.golang.org/grpc v1.49.0
2323
google.golang.org/protobuf v1.28.1
2424
k8s.io/api v0.26.0
@@ -39,7 +39,7 @@ require (
3939
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1
4040
github.com/go-ini/ini v1.67.0
4141
github.com/jongio/azidext/go/azidext v0.4.0
42-
github.com/onsi/ginkgo/v2 v2.7.0
42+
github.com/onsi/ginkgo/v2 v2.9.2
4343
github.com/pkg/errors v0.9.1
4444
github.com/satori/go.uuid v1.2.0
4545
k8s.io/apiserver v0.26.0
@@ -70,12 +70,14 @@ require (
7070
github.com/go-openapi/jsonpointer v0.19.5 // indirect
7171
github.com/go-openapi/jsonreference v0.20.0 // indirect
7272
github.com/go-openapi/swag v0.19.14 // indirect
73+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
7374
github.com/gogo/protobuf v1.3.2 // indirect
7475
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
7576
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7677
github.com/google/gnostic v0.5.7-v3refs // indirect
7778
github.com/google/go-cmp v0.5.9 // indirect
7879
github.com/google/gofuzz v1.1.0 // indirect
80+
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
7981
github.com/google/uuid v1.3.0 // indirect
8082
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
8183
github.com/inconshreveable/mousetrap v1.0.1 // indirect
@@ -111,10 +113,11 @@ require (
111113
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
112114
golang.org/x/crypto v0.6.0 // indirect
113115
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
114-
golang.org/x/sys v0.5.0 // indirect
115-
golang.org/x/term v0.5.0 // indirect
116-
golang.org/x/text v0.7.0 // indirect
116+
golang.org/x/sys v0.6.0 // indirect
117+
golang.org/x/term v0.6.0 // indirect
118+
golang.org/x/text v0.8.0 // indirect
117119
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
120+
golang.org/x/tools v0.7.0 // indirect
118121
google.golang.org/appengine v1.6.7 // indirect
119122
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
120123
gopkg.in/inf.v0 v0.9.1 // indirect
@@ -125,14 +128,14 @@ require (
125128
k8s.io/component-helpers v0.26.0 // indirect
126129
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
127130
k8s.io/kubectl v0.0.0 // indirect
131+
k8s.io/kubelet v0.26.0 // indirect
128132
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.33 // indirect
129133
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
130134
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
131135
)
132136

133137
replace (
134138
github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e
135-
github.com/onsi/ginkgo/v2 => github.com/onsi/ginkgo/v2 v2.4.0
136139
go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
137140
k8s.io/api => k8s.io/api v0.26.0
138141
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.26.0

0 commit comments

Comments
 (0)