Merge pull request #3465 from jwcesign/fix-2

Fixing probability of failure in CLI workflow
karmada-io · Apr 26, 2023 · 0f84dd7 · 0f84dd7
2 parents 22fb1d0 + 3dfaa2b
commit 0f84dd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/hack/cli-testing-environment.sh b/hack/cli-testing-environment.sh
@@ -43,12 +43,12 @@ kubectl wait --for=condition=Ready nodes --all --timeout=800s --kubeconfig=${KUB
 util::wait_nodes_taint_disappear 800 ${KUBECONFIG_PATH}/${HOST_CLUSTER_NAME}.config
 
 util::wait_file_exist ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_1_NAME}.config 300
-util::wait_context_exist "kind-${MEMBER_CLUSTER_1_NAME}" ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_1_NAME}.config 300
+util::wait_context_exist "${MEMBER_CLUSTER_1_NAME}" ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_1_NAME}.config 300
 kubectl wait --for=condition=Ready nodes --all --timeout=800s --kubeconfig=${KUBECONFIG_PATH}/${MEMBER_CLUSTER_1_NAME}.config
 util::wait_nodes_taint_disappear 800 ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_1_NAME}.config
 
 util::wait_file_exist ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_2_NAME}.config 300
-util::wait_context_exist "kind-${MEMBER_CLUSTER_2_NAME}" ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_2_NAME}.config 300
+util::wait_context_exist "${MEMBER_CLUSTER_2_NAME}" ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_2_NAME}.config 300
 kubectl wait --for=condition=Ready nodes --all --timeout=800s --kubeconfig=${KUBECONFIG_PATH}/${MEMBER_CLUSTER_2_NAME}.config
 util::wait_nodes_taint_disappear 800 ${KUBECONFIG_PATH}/${MEMBER_CLUSTER_2_NAME}.config
 

diff --git a/hack/util.sh b/hack/util.sh
@@ -320,7 +320,7 @@ function util::wait_context_exist() {
     local timeout=${3}
     local error_msg="[ERROR] Timeout waiting for context exist ${context_name}"
     for ((time=0; time<${timeout}; time++)); do
-        if [[ `grep -c "${context_name}" ${file_path}` -ne '0' ]]; then
+        if [[ `kubectl config get-contexts ${context_name} --kubeconfig=${file_path}` =~ ${context_name} ]]; then
             return 0
         fi
         sleep 1