From 6b91f12f6095f4f4b20640733ebef3db00bb4f61 Mon Sep 17 00:00:00 2001
From: Chunlin Yang <chuyang@redhat.com>
Date: Tue, 7 Jan 2025 16:39:41 +0800
Subject: [PATCH] Delete the container forcely (#1314)

Signed-off-by: clyang82 <chuyang@redhat.com>
---
 test/script/e2e_setup.sh |  5 ++---
 test/script/util.sh      | 10 +++++++++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/script/e2e_setup.sh b/test/script/e2e_setup.sh
index 1f7cca4e4..225fabbdc 100755
--- a/test/script/e2e_setup.sh
+++ b/test/script/e2e_setup.sh
@@ -18,12 +18,11 @@ start=$(date +%s)
 # Init clusters
 start_time=$(date +%s)
 
-kind_cluster "$GH_NAME" 2>&1 &
+kind_cluster "$GH_NAME"
 for i in $(seq 1 "${MH_NUM}"); do
-  kind_cluster "hub$i" 2>&1 &
+  kind_cluster "hub$i"
 done
 
-wait
 echo -e "${YELLOW} creating clusters:${NC} $(($(date +%s) - start_time)) seconds"
 
 # service-ca
diff --git a/test/script/util.sh b/test/script/util.sh
index 2716b8199..d1083955a 100755
--- a/test/script/util.sh
+++ b/test/script/util.sh
@@ -108,9 +108,16 @@ kind_cluster() {
   dir="${CONFIG_DIR:-$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)}"
   local cluster_name="$1"
   local kubeconfig="$dir/$cluster_name"
-  while [ ! -f "$kubeconfig" ] || ! kubectl config get-contexts -o name | grep -wq "$cluster_name"; do
+  local max_retries=5
+  local counter=0
+  while [ $counter -lt $max_retries ] && ( [ ! -f "$kubeconfig" ] || ! kubectl config get-contexts -o name | grep -wq "$cluster_name" ); do
     ensure_cluster "$cluster_name" "$kubeconfig"
+    counter=$((counter + 1))
   done
+  if [ $counter -eq $max_retries ]; then
+    echo "Failed to create cluster $cluster_name"
+    exit 1
+  fi
   echo "kind clusters: $(kind get clusters)"
 }
 
@@ -123,6 +130,7 @@ ensure_cluster() {
 
   if kind get clusters | grep -q "^$cluster_name$"; then
     kind delete cluster --name="$cluster_name"
+    docker rm -f "$cluster_name-control-plane"
   fi
 
   kind create cluster --name "$cluster_name" --image=kindest/node:v1.23.0 --wait 5m