From 61fca129a0432efe8a5ce0038c87a299e4ec8521 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 23 May 2021 09:47:55 +0000 Subject: [PATCH] test: run external e2e test using 1.20 suites run on 1.20 run on 1.21 run on 1.20 --- test/external-e2e/run.sh | 6 +++--- test/external-e2e/testdriver.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/external-e2e/run.sh b/test/external-e2e/run.sh index f1d1b3d6..c41c5840 100644 --- a/test/external-e2e/run.sh +++ b/test/external-e2e/run.sh @@ -24,12 +24,12 @@ 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 for kubernetes v1.20 + curl -sL https://storage.googleapis.com/kubernetes-release/release/v1.20.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 nfs - mkdir -p /tmp/csi-nfs && cp deploy/example/storageclass-nfs.yaml /tmp/csi-nfs/storageclass.yaml + mkdir -p /tmp/csi && cp deploy/example/storageclass-nfs.yaml /tmp/csi/storageclass.yaml make e2e-bootstrap make install-nfs-server } diff --git a/test/external-e2e/testdriver.yaml b/test/external-e2e/testdriver.yaml index b51d970e..1cf77cfd 100644 --- a/test/external-e2e/testdriver.yaml +++ b/test/external-e2e/testdriver.yaml @@ -2,7 +2,7 @@ # See https://github.com/kubernetes/kubernetes/tree/master/test/e2e/storage/external StorageClass: - FromFile: /tmp/csi-nfs/storageclass.yaml + FromFile: /tmp/csi/storageclass.yaml DriverInfo: Name: nfs.csi.k8s.io Capabilities: