From c454a51ccda184f68a8c4429398c7a2f9e44ff85 Mon Sep 17 00:00:00 2001
From: Mehran Kholdi <semekh@hamravesh.com>
Date: Tue, 29 Jun 2021 15:02:26 +0430
Subject: [PATCH] Nit: cleanup e2e test scripts

---
 .ci/e2e-test/rawfile-driver.yaml | 1 +
 .ci/e2e-test/setup.sh            | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.ci/e2e-test/rawfile-driver.yaml b/.ci/e2e-test/rawfile-driver.yaml
index ae06f0e..3fbe07c 100644
--- a/.ci/e2e-test/rawfile-driver.yaml
+++ b/.ci/e2e-test/rawfile-driver.yaml
@@ -19,5 +19,6 @@ DriverInfo:
     RWX: false
     controllerExpansion: true
     nodeExpansion: true
+    onlineExpansion: true
     volumeLimits: false
 InlineVolumes: []
diff --git a/.ci/e2e-test/setup.sh b/.ci/e2e-test/setup.sh
index 67b2a9b..397e222 100755
--- a/.ci/e2e-test/setup.sh
+++ b/.ci/e2e-test/setup.sh
@@ -2,14 +2,15 @@
 set -ex
 source .ci/common
 
-curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v1.18.1/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
+K8S_VERSION=1.18.20
+MINIKUBE_VERSION=1.18.1
+curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/v${K8S_VERSION}/bin/linux/amd64/kubectl && chmod +x kubectl && sudo mv kubectl /usr/local/bin/
 sudo apt update && sudo apt install -y conntrack
-curl -Lo minikube https://storage.googleapis.com/minikube/releases/v1.8.1/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
+curl -Lo minikube https://storage.googleapis.com/minikube/releases/v${MINIKUBE_VERSION}/minikube-linux-amd64 && chmod +x minikube && sudo mv minikube /usr/local/bin/
 mkdir -p $HOME/.kube $HOME/.minikube
 touch $KUBECONFIG
-sudo minikube start --profile=minikube --vm-driver=none --kubernetes-version=v1.18.1
+sudo minikube start --profile=minikube --vm-driver=none --kubernetes-version=v${K8S_VERSION}
 minikube update-context --profile=minikube
-chown -R $(id -un):$(id -gn) ${HOME}/.minikube/
 eval "$(minikube docker-env --profile=minikube)" && export DOCKER_CLI='docker'
 
 curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash