From 0f1e843bf38189ac4133fc84a77908bb550f5499 Mon Sep 17 00:00:00 2001
From: KfreeZ <kefei.zhang@intel.com>
Date: Wed, 4 Sep 2024 09:24:29 +0800
Subject: [PATCH]  skip use pod_count in e2e's check_gmc_status, the pod_count
 is not acurrate sometimes when terninating pod is not cleared but counted

Signed-off-by: KfreeZ <kefei.zhang@intel.com>
---
 .github/workflows/scripts/e2e/gmc_xeon_test.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/scripts/e2e/gmc_xeon_test.sh b/.github/workflows/scripts/e2e/gmc_xeon_test.sh
index 39f1716e..080279df 100755
--- a/.github/workflows/scripts/e2e/gmc_xeon_test.sh
+++ b/.github/workflows/scripts/e2e/gmc_xeon_test.sh
@@ -137,7 +137,7 @@ function validate_audioqa() {
     pods_count=$(kubectl get pods -n $AUDIOQA_NAMESPACE -o jsonpath='{.items[*].metadata.name}' | wc -w)
     # expected_ready_pods, expected_external_pods, expected_total_pods
     # pods_count-1 is to exclude the client pod in this namespace
-    check_gmc_status $AUDIOQA_NAMESPACE 'audioqa' $((pods_count-1)) 0 7
+    check_gmc_status $AUDIOQA_NAMESPACE 'audioqa' 7 0 7
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1
@@ -190,7 +190,7 @@ function validate_chatqna() {
     pods_count=$(kubectl get pods -n $CHATQNA_NAMESPACE -o jsonpath='{.items[*].metadata.name}' | wc -w)
     # expected_ready_pods, expected_external_pods, expected_total_pods
     # pods_count-1 is to exclude the client pod in this namespace
-    check_gmc_status $CHATQNA_NAMESPACE 'chatqa' $((pods_count-1)) 0 9
+    check_gmc_status $CHATQNA_NAMESPACE 'chatqa' 9 0 9
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1
@@ -260,7 +260,7 @@ function validate_chatqna_with_dataprep() {
     pods_count=$(kubectl get pods -n $CHATQNA_DATAPREP_NAMESPACE -o jsonpath='{.items[*].metadata.name}' | wc -w)
     # expected_ready_pods, expected_external_pods, expected_total_pods
     # pods_count-1 is to exclude the client pod in this namespace
-    check_gmc_status $CHATQNA_DATAPREP_NAMESPACE 'chatqa' $((pods_count-1)) 0 10
+    check_gmc_status $CHATQNA_DATAPREP_NAMESPACE 'chatqa' 10 0 10
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1
@@ -353,7 +353,7 @@ function validate_chatqna_in_switch() {
     pods_count=$(kubectl get pods -n $CHATQNA_SWITCH_NAMESPACE -o jsonpath='{.items[*].metadata.name}' | wc -w)
     # expected_ready_pods, expected_external_pods, expected_total_pods
     # pods_count-1 is to exclude the client pod in this namespace
-    check_gmc_status $CHATQNA_SWITCH_NAMESPACE 'switch' $((pods_count-1)) 0 15
+    check_gmc_status $CHATQNA_SWITCH_NAMESPACE 'switch' 15 0 15
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1
@@ -444,7 +444,7 @@ function validate_modify_config() {
     fi
 
     pods_count=$(kubectl get pods -n $MODIFY_STEP_NAMESPACE -o jsonpath='{.items[*].metadata.name}' | wc -w)
-    check_gmc_status $MODIFY_STEP_NAMESPACE 'codegen' $pods_count 0 3
+    check_gmc_status $MODIFY_STEP_NAMESPACE 'codegen' 3 0 3
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1
@@ -461,7 +461,7 @@ function validate_modify_config() {
          exit 1
     fi
 
-    check_gmc_status $MODIFY_STEP_NAMESPACE 'codegen' $pods_count 0 3
+    check_gmc_status $MODIFY_STEP_NAMESPACE 'codegen' 3 0 3
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1
@@ -495,7 +495,7 @@ function validate_remove_step() {
     fi
 
     pods_count=$(kubectl get pods -n $DELETE_STEP_NAMESPACE -o jsonpath='{.items[*].metadata.name}' | wc -w)
-    check_gmc_status $DELETE_STEP_NAMESPACE 'codegen' $pods_count 0 3
+    check_gmc_status $DELETE_STEP_NAMESPACE 'codegen' 3 0 3
     if [ $? -ne 0 ]; then
        echo "GMC status is not as expected"
        exit 1