From 99cbaccdf1d254615e2f9cc52d73e689917c7188 Mon Sep 17 00:00:00 2001 From: zhuwenxing Date: Fri, 3 Jun 2022 17:14:04 +0800 Subject: [PATCH] [skip e2e]Update the method to check health for deploy (#17359) Signed-off-by: zhuwenxing --- tests/python_client/deploy/check_healthy.sh | 6 +++--- tests/python_client/deploy/utils.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/python_client/deploy/check_healthy.sh b/tests/python_client/deploy/check_healthy.sh index eec789209e..e5f647ef81 100644 --- a/tests/python_client/deploy/check_healthy.sh +++ b/tests/python_client/deploy/check_healthy.sh @@ -2,8 +2,8 @@ #to check containers all running and minio is healthy function check_healthy { - Expect=$(grep "container_name" docker-compose.yml | wc -l) - Expect_health=$(grep "healthcheck" docker-compose.yml | wc -l) + Expect=$(yq '.services | length' 'docker-compose.yml') + Expect_health=$(yq '.services' 'docker-compose.yml' |grep 'healthcheck'|wc -l) cnt=$(docker-compose ps | grep -E "running|Running|Up|up" | wc -l) healthy=$(docker-compose ps | grep "healthy" | wc -l) time_cnt=0 @@ -27,4 +27,4 @@ function check_healthy { done } -check_healthy \ No newline at end of file +check_healthy diff --git a/tests/python_client/deploy/utils.sh b/tests/python_client/deploy/utils.sh index 805335a181..3511554c19 100644 --- a/tests/python_client/deploy/utils.sh +++ b/tests/python_client/deploy/utils.sh @@ -30,8 +30,8 @@ function replace_image_tag { #to check containers all running and minio is healthy function check_healthy { - Expect=$(grep "container_name" docker-compose.yml | wc -l) - Expect_health=$(grep "healthcheck" docker-compose.yml | wc -l) + Expect=$(yq '.services | length' 'docker-compose.yml') + Expect_health=$(yq '.services' 'docker-compose.yml' |grep 'healthcheck'|wc -l) cnt=$(docker-compose ps | grep -E "running|Running|Up|up" | wc -l) healthy=$(docker-compose ps | grep "healthy" | wc -l) time_cnt=0 @@ -53,4 +53,4 @@ function check_healthy { echo "running num $cnt expect num $Expect" echo "healthy num $healthy expect num $Expect_health" done -} \ No newline at end of file +}