Merge pull request #274 from andyzhangx/external-tests-1.21

test: run 1.21 external test suites

Author: andyzhangx

test/external-e2e/run.sh

@@ -24,12 +24,13 @@ install_ginkgo () {
 }
 
 setup_e2e_binaries() {
-    # download k8s external e2e binary for kubernetes v1.19
-    curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.19.0/kubernetes-test-linux-amd64.tar.gz --output e2e-tests.tar.gz
+    # download k8s external e2e binary
+    curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.21.0/kubernetes-test-linux-amd64.tar.gz --output e2e-tests.tar.gz
     tar -xvf e2e-tests.tar.gz && rm e2e-tests.tar.gz
 
-    # install the csi driver smb
-    mkdir -p /tmp/csi-smb && cp deploy/example/storageclass-smb.yaml /tmp/csi-smb/storageclass.yaml
+    # install csi driver smb
+    mkdir -p /tmp/csi && cp deploy/example/storageclass-smb.yaml /tmp/csi/storageclass.yaml
+    sed -i 's/Retain/Delete/g' /tmp/csi/storageclass.yaml
     make e2e-bootstrap
     make install-smb-provisioner
     make create-metrics-svc
@@ -45,6 +46,6 @@ setup_e2e_binaries
 trap print_logs EXIT
 
 ginkgo -p --progress --v -focus='External.Storage' \
-       -skip='\[Disruptive\]|\[Slow\]' kubernetes/test/bin/e2e.test  -- \
+       -skip='\[Disruptive\]|\[Slow\]|unmount after the subpath directory is deleted|support two pods which share the same volume' kubernetes/test/bin/e2e.test  -- \
        -storage.testdriver=$PROJECT_ROOT/test/external-e2e/testdriver.yaml \
        --kubeconfig=$KUBECONFIG

test/external-e2e/testdriver.yaml

@@ -3,7 +3,7 @@
 
 ShortName: smb
 StorageClass:
-  FromFile: /tmp/csi-smb/storageclass.yaml
+  FromFile: /tmp/csi/storageclass.yaml
 DriverInfo:
   Name: smb.csi.k8s.io
   Capabilities: