finalize e2e tests

Makefile

@@ -135,8 +135,10 @@ setup-external-e2e:
 	cp ./kubernetes/test/bin/e2e.test /tmp/csi-nfs/e2e.test
 	rm -r kubernetes
 	cp ./examples/kubernetes/storageclass-nfs.yaml /tmp/csi-nfs/storageclass.yaml
-	cp ./test/e2e_external/testdriver.yaml /tmp/csi-nfs/testdriver.yaml
+	cp ./test/e2e-external/testdriver.yaml /tmp/csi-nfs/testdriver.yaml
+	./deploy/install-driver.sh
+	kubectl apply -f deploy/example/nfs-provisioner/nfs-server.yaml
 
 .PHONY: run-external-e2e
-run-external-e2e:
-	bash ./test/e2e_external/run.sh
+run-external-e2e: setup-external-e2e
+	bash ./test/e2e-external/run.sh

test/e2e-external/README.md

@@ -4,15 +4,16 @@
 This directory imports tests from kubernetes/kubernetes and enables:
 
 * External CSI tests, https://github.com/kubernetes/kubernetes/tree/master/test/e2e/storage/external
-* CSI migration tests
 
 # Prerequisites
 - kubernetes 1.17+
 
 # Run
 * External CSI tests: `FOCUS=External.Storage`.
-* CSI migration tests: `FOCUS=[nfs]`.
 
 ```sh
-ginkgo -p --progress --v -focus='External.Storage.*nfs' -skip='\[Disruptive\]' /tmp/csi-nfs/e2e.test --storage.testdriver=/tmp/csi-nfs/testdriver.yaml --kubeconfig=$KUBECONFIG
+ginkgo -p --progress --v -focus='External.Storage' \
+       -skip='\[Disruptive\]' /tmp/csi-nfs/e2e.test -- \
+       -storage.testdriver=/tmp/csi-nfs/testdriver.yaml \
+       --kubeconfig=$KUBECONFIG
 ```

test/e2e-external/run.sh

@@ -13,9 +13,7 @@
 # limitations under the License.
 
 #!/bin/bash
-ginkgo -p --progress --v -focus='External.Storage.*csi-nfsplugin' \
-       -skip='\[Disruptive\]' \
-       /tmp/csi-nfs/e2e.test \
-       -- \
+ginkgo -p --progress --v -focus='External.Storage' \
+       -skip='\[Disruptive\]' /tmp/csi-nfs/e2e.test -- \
        -storage.testdriver=/tmp/csi-nfs/testdriver.yaml \
-       --kubeconfig=$HOME/.kube/config
+       --kubeconfig=$KUBECONFIG