Skip to content

Commit c8798c0

Browse files
andyzhangxandyzhangx
committed
test: make copy volume test pass
fix
1 parent 870dc9c commit c8798c0

6 files changed

+27
-9
lines changed

‎deploy/example/storageclass-blob-nfs.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
provisioner: blob.csi.azure.com
77
parameters:
88
protocol: nfs
9+
useDataPlaneAPI: "false"
910
volumeBindingMode: Immediate
1011
allowVolumeExpansion: true
1112
mountOptions:

‎deploy/example/storageclass-blobfuse.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ metadata:
66
provisioner: blob.csi.azure.com
77
parameters:
88
skuName: Premium_LRS # available values: Standard_LRS, Premium_LRS, Standard_GRS, Standard_RAGRS, Standard_ZRS, Premium_ZRS
9+
useDataPlaneAPI: "false"
910
reclaimPolicy: Delete
1011
volumeBindingMode: Immediate
1112
allowVolumeExpansion: true

‎deploy/example/storageclass-blobfuse2.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ provisioner: blob.csi.azure.com
77
parameters:
88
skuName: Premium_LRS # available values: Standard_LRS, Premium_LRS, Standard_GRS, Standard_RAGRS, Standard_ZRS, Premium_ZRS
99
protocol: fuse2
10+
useDataPlaneAPI: "false"
1011
reclaimPolicy: Delete
1112
volumeBindingMode: Immediate
1213
allowVolumeExpansion: true

‎test/e2e/dynamic_provisioning_test.go

+16-8
Original file line numberDiff line numberDiff line change
@@ -962,6 +962,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
962962
Pod: pod,
963963
PodWithClonedVolume: podWithClonedVolume,
964964
StorageClassParameters: map[string]string{
965+
"useDataPlaneAPI": "true",
965966
"skuName": "Premium_LRS",
966967
"protocol": "nfs",
967968
"mountPermissions": "0755",
@@ -994,6 +995,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
994995
Pod: pod,
995996
PodWithClonedVolume: podWithClonedVolume,
996997
StorageClassParameters: map[string]string{
998+
"useDataPlaneAPI": "true",
997999
"skuName": "Premium_LRS",
9981000
"protocol": "nfs",
9991001
"mountPermissions": "0755",
@@ -1027,8 +1029,9 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
10271029
Pod: pod,
10281030
PodWithClonedVolume: podWithClonedVolume,
10291031
StorageClassParameters: map[string]string{
1030-
"skuName": "Standard_LRS",
1031-
"protocol": "fuse2",
1032+
"useDataPlaneAPI": "true",
1033+
"skuName": "Standard_LRS",
1034+
"protocol": "fuse2",
10321035
},
10331036
}
10341037
test.Run(ctx, cs, ns)
@@ -1059,8 +1062,9 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
10591062
Pod: pod,
10601063
PodWithClonedVolume: podWithClonedVolume,
10611064
StorageClassParameters: map[string]string{
1062-
"skuName": "Standard_LRS",
1063-
"protocol": "fuse2",
1065+
"useDataPlaneAPI": "true",
1066+
"skuName": "Standard_LRS",
1067+
"protocol": "fuse2",
10641068
},
10651069
}
10661070
test.Run(ctx, cs, ns)
@@ -1090,12 +1094,14 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
10901094
Pod: pod,
10911095
PodWithClonedVolume: podWithClonedVolume,
10921096
StorageClassParameters: map[string]string{
1097+
"useDataPlaneAPI": "true",
10931098
"skuName": "Premium_LRS",
10941099
"protocol": "nfs",
10951100
"mountPermissions": "0755",
10961101
"allowsharedkeyaccess": "true",
10971102
},
10981103
ClonedStorageClassParameters: map[string]string{
1104+
"useDataPlaneAPI": "true",
10991105
"skuName": "Standard_LRS",
11001106
"protocol": "nfs",
11011107
"mountPermissions": "0755",
@@ -1130,12 +1136,14 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
11301136
Pod: pod,
11311137
PodWithClonedVolume: podWithClonedVolume,
11321138
StorageClassParameters: map[string]string{
1133-
"skuName": "Standard_LRS",
1134-
"protocol": "fuse2",
1139+
"useDataPlaneAPI": "true",
1140+
"skuName": "Standard_LRS",
1141+
"protocol": "fuse2",
11351142
},
11361143
ClonedStorageClassParameters: map[string]string{
1137-
"skuName": "Premium_LRS",
1138-
"protocol": "fuse2",
1144+
"useDataPlaneAPI": "true",
1145+
"skuName": "Premium_LRS",
1146+
"protocol": "fuse2",
11391147
},
11401148
}
11411149
test.Run(ctx, cs, ns)

‎test/e2e/pre_provisioning_test.go

+2
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Pre-Provisioned", func() {
219219
})
220220

221221
ginkgo.It("should use Key Vault", func(ctx ginkgo.SpecContext) {
222+
ginkgo.Skip("test case is not available currently due to test-infra migration")
222223
volumeSize := fmt.Sprintf("%dGi", defaultVolumeSize)
223224
reclaimPolicy := v1.PersistentVolumeReclaimRetain
224225
volumeBindingMode := storagev1.VolumeBindingImmediate
@@ -252,6 +253,7 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Pre-Provisioned", func() {
252253
})
253254

254255
ginkgo.It("should use SAS token", func(ctx ginkgo.SpecContext) {
256+
ginkgo.Skip("test case is not available currently due to test-infra migration")
255257
pods := []testsuites.PodDetails{
256258
{
257259
Cmd: "echo 'hello world' > /mnt/test-1/data && grep 'hello world' /mnt/test-1/data",

‎test/external-e2e/run.sh

+6-1
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@ setup_e2e_binaries() {
3030
export EXTRA_HELM_OPTIONS=$EXTRA_HELM_OPTIONS" --set feature.fsGroupPolicy=File"
3131
fi
3232

33-
# test on alternative driver name
33+
# test on alternative driver name
3434
sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse.yaml
3535
sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blobfuse2.yaml
3636
sed -i "s/blob.csi.azure.com/$DRIVER.csi.azure.com/g" deploy/example/storageclass-blob-nfs.yaml
37+
# workaround: use useDataPlaneAPI as true for blobfuse and nfs copy volume tests
38+
sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blobfuse.yaml
39+
sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blobfuse2.yaml
40+
sed -i "s/\"false\"/\"true\"/g" deploy/example/storageclass-blob-nfs.yaml
41+
3742
make e2e-bootstrap
3843
sed -i "s/csi-blob-controller/csi-$DRIVER-controller/g" deploy/example/metrics/csi-blob-controller-svc.yaml
3944
make create-metrics-svc

0 commit comments

Comments
 (0)