Skip to content

Commit 95f7e89

Browse files
committed
test: refine sanity test script
1 parent fe80782 commit 95f7e89

File tree

4 files changed

+67
-4
lines changed

4 files changed

+67
-4
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/blob-csi-driver
22

3-
go 1.13
3+
go 1.15
44

55
require (
66
github.com/Azure/azure-sdk-for-go v49.1.0+incompatible

test/sanity/run-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ fi
3434
_output/blobplugin --endpoint "$endpoint" --nodeid "$nodeid" -v=5 &
3535

3636
echo "Begin to run sanity test..."
37-
readonly CSI_SANITY_BIN='csi-test/cmd/csi-sanity/csi-sanity'
37+
readonly CSI_SANITY_BIN='csi-sanity'
3838
"$CSI_SANITY_BIN" --ginkgo.v --csi.endpoint=$endpoint -ginkgo.skip="should fail when requesting to create a volume with already existing name and different capacity"

test/sanity/run-tests-all-clouds.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,13 @@ readonly cloud="$1"
2020

2121
function install_csi_sanity_bin {
2222
echo 'Installing CSI sanity test binary...'
23+
mkdir -p $GOPATH/src/github.com/kubernetes-csi
24+
pushd $GOPATH/src/github.com/kubernetes-csi
25+
export GO111MODULE=off
2326
git clone https://github.com/kubernetes-csi/csi-test.git -b v2.2.0
2427
pushd csi-test/cmd/csi-sanity
25-
make
28+
make install
29+
popd
2630
popd
2731
}
2832

@@ -43,6 +47,8 @@ else
4347
cp test/artifacts/blobfuse /usr/bin/blobfuse
4448
fi
4549

46-
install_csi_sanity_bin
4750
apt update && apt install libfuse2 -y
51+
if [[ -z "$(command -v csi-sanity)" ]]; then
52+
install_csi_sanity_bin
53+
fi
4854
test/sanity/run-test.sh "$nodeid"

vendor/modules.txt

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# github.com/Azure/azure-sdk-for-go v49.1.0+incompatible
2+
## explicit
23
github.com/Azure/azure-sdk-for-go/services/compute/mgmt/2020-06-30/compute
34
github.com/Azure/azure-sdk-for-go/services/containerservice/mgmt/2020-04-01/containerservice
45
github.com/Azure/azure-sdk-for-go/services/keyvault/2016-10-01/keyvault
@@ -11,9 +12,11 @@ github.com/Azure/azure-sdk-for-go/version
1112
# github.com/Azure/go-autorest v14.2.0+incompatible
1213
github.com/Azure/go-autorest
1314
# github.com/Azure/go-autorest/autorest v0.11.1
15+
## explicit
1416
github.com/Azure/go-autorest/autorest
1517
github.com/Azure/go-autorest/autorest/azure
1618
# github.com/Azure/go-autorest/autorest/adal v0.9.5
19+
## explicit
1720
github.com/Azure/go-autorest/autorest/adal
1821
# github.com/Azure/go-autorest/autorest/date v0.3.0
1922
github.com/Azure/go-autorest/autorest/date
@@ -58,6 +61,7 @@ github.com/blang/semver
5861
# github.com/cespare/xxhash/v2 v2.1.1
5962
github.com/cespare/xxhash/v2
6063
# github.com/container-storage-interface/spec v1.3.0 => github.com/container-storage-interface/spec v1.3.0
64+
## explicit
6165
github.com/container-storage-interface/spec/lib/go/csi
6266
# github.com/davecgh/go-spew v1.1.1
6367
github.com/davecgh/go-spew/spew
@@ -79,8 +83,10 @@ github.com/gogo/protobuf/sortkeys
7983
# github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
8084
github.com/golang/groupcache/lru
8185
# github.com/golang/mock v1.4.3
86+
## explicit
8287
github.com/golang/mock/gomock
8388
# github.com/golang/protobuf v1.4.3
89+
## explicit
8490
github.com/golang/protobuf/descriptor
8591
github.com/golang/protobuf/proto
8692
github.com/golang/protobuf/protoc-gen-go/descriptor
@@ -113,12 +119,14 @@ github.com/hpcloud/tail/util
113119
github.com/hpcloud/tail/watch
114120
github.com/hpcloud/tail/winfile
115121
# github.com/imdario/mergo v0.3.9
122+
## explicit
116123
github.com/imdario/mergo
117124
# github.com/jmespath/go-jmespath v0.4.0
118125
github.com/jmespath/go-jmespath
119126
# github.com/json-iterator/go v1.1.10
120127
github.com/json-iterator/go
121128
# github.com/kubernetes-csi/csi-lib-utils v0.7.0
129+
## explicit
122130
github.com/kubernetes-csi/csi-lib-utils/protosanitizer
123131
# github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369
124132
github.com/matttproud/golang_protobuf_extensions/pbutil
@@ -127,6 +135,7 @@ github.com/modern-go/concurrent
127135
# github.com/modern-go/reflect2 v1.0.1
128136
github.com/modern-go/reflect2
129137
# github.com/onsi/ginkgo v1.11.0
138+
## explicit
130139
github.com/onsi/ginkgo
131140
github.com/onsi/ginkgo/config
132141
github.com/onsi/ginkgo/internal/codelocation
@@ -146,6 +155,7 @@ github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable
146155
github.com/onsi/ginkgo/reporters/stenographer/support/go-isatty
147156
github.com/onsi/ginkgo/types
148157
# github.com/onsi/gomega v1.8.1
158+
## explicit
149159
github.com/onsi/gomega
150160
github.com/onsi/gomega/format
151161
github.com/onsi/gomega/internal/assertion
@@ -161,8 +171,10 @@ github.com/onsi/gomega/types
161171
# github.com/opencontainers/go-digest v1.0.0
162172
github.com/opencontainers/go-digest
163173
# github.com/pborman/uuid v1.2.0
174+
## explicit
164175
github.com/pborman/uuid
165176
# github.com/pelletier/go-toml v1.2.0
177+
## explicit
166178
github.com/pelletier/go-toml
167179
# github.com/pkg/errors v0.9.1
168180
github.com/pkg/errors
@@ -191,6 +203,7 @@ github.com/satori/go.uuid
191203
# github.com/spf13/pflag v1.0.5
192204
github.com/spf13/pflag
193205
# github.com/stretchr/testify v1.6.1
206+
## explicit
194207
github.com/stretchr/testify/assert
195208
# golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0
196209
golang.org/x/crypto/blowfish
@@ -206,6 +219,7 @@ golang.org/x/crypto/ssh
206219
golang.org/x/crypto/ssh/internal/bcrypt_pbkdf
207220
golang.org/x/crypto/ssh/terminal
208221
# golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
222+
## explicit
209223
golang.org/x/net/context
210224
golang.org/x/net/context/ctxhttp
211225
golang.org/x/net/html
@@ -262,6 +276,7 @@ google.golang.org/appengine/urlfetch
262276
# google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a
263277
google.golang.org/genproto/googleapis/rpc/status
264278
# google.golang.org/grpc v1.28.0 => google.golang.org/grpc v1.27.0
279+
## explicit
265280
google.golang.org/grpc
266281
google.golang.org/grpc/attributes
267282
google.golang.org/grpc/backoff
@@ -342,6 +357,7 @@ gopkg.in/yaml.v2
342357
# gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
343358
gopkg.in/yaml.v3
344359
# k8s.io/api v0.20.0 => k8s.io/api v0.20.0
360+
## explicit
345361
k8s.io/api/admission/v1
346362
k8s.io/api/admission/v1beta1
347363
k8s.io/api/admissionregistration/v1
@@ -388,6 +404,7 @@ k8s.io/api/storage/v1
388404
k8s.io/api/storage/v1alpha1
389405
k8s.io/api/storage/v1beta1
390406
# k8s.io/apimachinery v0.20.0 => k8s.io/apimachinery v0.20.0
407+
## explicit
391408
k8s.io/apimachinery/pkg/api/equality
392409
k8s.io/apimachinery/pkg/api/errors
393410
k8s.io/apimachinery/pkg/api/meta
@@ -481,6 +498,7 @@ k8s.io/apiserver/pkg/util/feature
481498
k8s.io/apiserver/pkg/util/webhook
482499
k8s.io/apiserver/pkg/warning
483500
# k8s.io/client-go v0.20.0 => k8s.io/client-go v0.0.0-20201209050023-e24efdc77f15
501+
## explicit
484502
k8s.io/client-go/discovery
485503
k8s.io/client-go/discovery/cached/memory
486504
k8s.io/client-go/discovery/fake
@@ -720,6 +738,7 @@ k8s.io/cloud-provider/volume
720738
k8s.io/cloud-provider/volume/errors
721739
k8s.io/cloud-provider/volume/helpers
722740
# k8s.io/component-base v0.20.0 => k8s.io/component-base v0.20.0
741+
## explicit
723742
k8s.io/component-base/cli/flag
724743
k8s.io/component-base/config
725744
k8s.io/component-base/featuregate
@@ -733,6 +752,7 @@ k8s.io/component-helpers/scheduling/corev1/nodeaffinity
733752
# k8s.io/controller-manager v0.20.0 => k8s.io/controller-manager v0.20.0-alpha.1.0.20201209052538-b2c380a1dc86
734753
k8s.io/controller-manager/pkg/clientbuilder
735754
# k8s.io/klog/v2 v2.4.0
755+
## explicit
736756
k8s.io/klog/v2
737757
# k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
738758
k8s.io/kube-openapi/pkg/util/proto
@@ -742,6 +762,7 @@ k8s.io/kubectl/pkg/util/podutils
742762
# k8s.io/kubelet v0.0.0 => k8s.io/kubelet v0.20.0
743763
k8s.io/kubelet/pkg/apis/stats/v1alpha1
744764
# k8s.io/kubernetes v1.21.0-alpha.0.0.20201210005053-f58c4d8cd725
765+
## explicit
745766
k8s.io/kubernetes/pkg/api/legacyscheme
746767
k8s.io/kubernetes/pkg/api/service
747768
k8s.io/kubernetes/pkg/api/v1/pod
@@ -808,6 +829,7 @@ k8s.io/kubernetes/test/utils/image
808829
# k8s.io/mount-utils v0.0.0 => k8s.io/mount-utils v0.21.0-alpha.0
809830
k8s.io/mount-utils
810831
# k8s.io/utils v0.0.0-20201110183641-67b214c5f920
832+
## explicit
811833
k8s.io/utils/buffer
812834
k8s.io/utils/exec
813835
k8s.io/utils/exec/testing
@@ -825,6 +847,7 @@ k8s.io/utils/trace
825847
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/pkg/client
826848
sigs.k8s.io/apiserver-network-proxy/konnectivity-client/proto/client
827849
# sigs.k8s.io/cloud-provider-azure v0.0.0 => sigs.k8s.io/cloud-provider-azure v0.6.1-0.20201223035826-d12fc98b424d
850+
## explicit
828851
sigs.k8s.io/cloud-provider-azure/pkg/auth
829852
sigs.k8s.io/cloud-provider-azure/pkg/azureclients
830853
sigs.k8s.io/cloud-provider-azure/pkg/azureclients/armclient
@@ -864,4 +887,38 @@ sigs.k8s.io/cloud-provider-azure/pkg/retry
864887
# sigs.k8s.io/structured-merge-diff/v4 v4.0.2
865888
sigs.k8s.io/structured-merge-diff/v4/value
866889
# sigs.k8s.io/yaml v1.2.0
890+
## explicit
867891
sigs.k8s.io/yaml
892+
# github.com/container-storage-interface/spec => github.com/container-storage-interface/spec v1.3.0
893+
# github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.7.1
894+
# go.etcd.io/etcd => go.etcd.io/etcd v0.0.0-20200410171415-59f5fb25a533
895+
# google.golang.org/grpc => google.golang.org/grpc v1.27.0
896+
# k8s.io/api => k8s.io/api v0.20.0
897+
# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.0
898+
# k8s.io/apimachinery => k8s.io/apimachinery v0.20.0
899+
# k8s.io/apiserver => k8s.io/apiserver v0.20.0
900+
# k8s.io/cli-runtime => k8s.io/cli-runtime v0.20.0
901+
# k8s.io/client-go => k8s.io/client-go v0.0.0-20201209050023-e24efdc77f15
902+
# k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20200711020125-52e5381d8dd1
903+
# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.0
904+
# k8s.io/code-generator => k8s.io/code-generator v0.20.0
905+
# k8s.io/component-base => k8s.io/component-base v0.20.0
906+
# k8s.io/component-helpers => k8s.io/component-helpers v0.20.0-alpha.2.0.20201114090304-7cb42b694587
907+
# k8s.io/controller-manager => k8s.io/controller-manager v0.20.0-alpha.1.0.20201209052538-b2c380a1dc86
908+
# k8s.io/cri-api => k8s.io/cri-api v0.20.0
909+
# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20200530124324-08bf6a63b59d
910+
# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.20.0
911+
# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.20.0
912+
# k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
913+
# k8s.io/kube-proxy => k8s.io/kube-proxy v0.20.0
914+
# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.20.0
915+
# k8s.io/kubectl => k8s.io/kubectl v0.20.0
916+
# k8s.io/kubelet => k8s.io/kubelet v0.20.0
917+
# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20201125092503-cc0a0abf3d78
918+
# k8s.io/metrics => k8s.io/metrics v0.20.0
919+
# k8s.io/mount-utils => k8s.io/mount-utils v0.21.0-alpha.0
920+
# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.20.0
921+
# k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.20.0
922+
# k8s.io/sample-controller => k8s.io/sample-controller v0.20.0
923+
# sigs.k8s.io/cloud-provider-azure => sigs.k8s.io/cloud-provider-azure v0.6.1-0.20201223035826-d12fc98b424d
924+
# github.com/niemeyer/pretty => github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e

0 commit comments

Comments
 (0)