From 19f2211d3a4352e58a8c52c7d87b8d2152ca43d5 Mon Sep 17 00:00:00 2001
From: LiZhenCheng9527 <lizhencheng6@huawei.com>
Date: Fri, 23 Feb 2024 18:49:29 +0800
Subject: [PATCH] add helm install check and fix get VERSION function in
 install Kurator

Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
---
 hack/e2e-test/install-kurator.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/hack/e2e-test/install-kurator.sh b/hack/e2e-test/install-kurator.sh
index fbc8ebcb..c5711cb2 100755
--- a/hack/e2e-test/install-kurator.sh
+++ b/hack/e2e-test/install-kurator.sh
@@ -10,10 +10,20 @@ KUBECONFIG_PATH=${KUBECONFIG_PATH:-"${HOME}/.kube"}
 MAIN_KUBECONFIG=${MAIN_KUBECONFIG:-"${KUBECONFIG_PATH}/kurator-host.config"}
 export KUBECONFIG=${MAIN_KUBECONFIG}
 COMMIT_ID=$(git rev-parse --short HEAD)
-VERSION=$(echo "$COMMIT_ID" | grep -o '^[0-9]')
+VERSION=$(echo "$COMMIT_ID" | sed 's/[^0-9]//g')
 
 sleep 5s
 
+while true; do
+  if command -v helm >/dev/null 2>&1; then
+    echo "Helm is installed"
+    break
+  else
+    echo "Helm is not install, waiting..."
+  fi
+  sleep 5s
+done
+
 helm repo add jetstack https://charts.jetstack.io
 helm repo update
 kubectl create namespace cert-manager