Merge pull request kruize#1214 from chandrams/fix_path

Fixed the path for helpers
dinogun · Jun 27, 2024 · da295be · da295be
2 parents 9663b1f + fd9004b
commit da295be
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/tests/scripts/common/common_functions.sh b/tests/scripts/common/common_functions.sh
@@ -253,7 +253,7 @@ function deploy_autotune() {
 		echo "Namespace = $namespace"
 		if [ ${target} == "crc" ]; then
 			service="kruize"
-			autotune_pod=$(kubectl get pod -n ${namespace} | grep ${service} | grep -v kruize-ui | cut -d " " -f1)
+			autotune_pod=$(kubectl get pod -n ${namespace} | grep ${service} | grep -v kruize-ui | grep -v kruize-db | cut -d " " -f1)
 			echo "autotune_pod = $autotune_pod"
 			echo "kubectl -n ${namespace} logs -f ${autotune_pod} > "${AUTOTUNE_POD_LOG}" 2>&1 &"
 			kubectl -n ${namespace} logs -f ${autotune_pod} > "${AUTOTUNE_POD_LOG}" 2>&1 &
@@ -1798,7 +1798,7 @@ function get_autotune_pod_log() {
 
 	echo "target = $target"
 	if [ ${target} == "crc" ]; then
-		autotune_pod=$(kubectl get pod -n ${NAMESPACE} | grep kruize | grep -v kruize-ui | cut -d " " -f1)
+		autotune_pod=$(kubectl get pod -n ${NAMESPACE} | grep kruize | grep -v kruize-ui | grep -v kruize-db | cut -d " " -f1)
 		pod_log_msg=$(kubectl logs ${autotune_pod} -n ${NAMESPACE})
 	else
 		autotune_pod=$(kubectl get pod -n ${NAMESPACE} | grep autotune | cut -d " " -f1)

diff --git a/tests/scripts/helpers/utils.py b/tests/scripts/helpers/utils.py
@@ -709,7 +709,7 @@ def compare_json_files(json_file1, json_file2):
 
 
 def get_kruize_pod(namespace):
-    command = f"kubectl get pod -n {namespace} | grep kruize | grep -v kruize-ui | cut -d ' ' -f1"
+    command = f"kubectl get pod -n {namespace} | grep kruize | grep -v kruize-ui | grep -v kruize-db | cut -d ' ' -f1"
     # Execute the command and capture the output
     output = subprocess.check_output(command, shell=True)
 

diff --git a/tests/scripts/remote_monitoring_tests/db_migration_test/validate_reco_json.py b/tests/scripts/remote_monitoring_tests/db_migration_test/validate_reco_json.py
@@ -1,7 +1,7 @@
 import sys, getopt
 import datetime
 import json
-sys.path.append("..")
+sys.path.append("../..")
 
 from helpers.fixtures import *
 from helpers.generate_rm_jsons import *

diff --git a/...ts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh b/...ts/remote_monitoring_tests/fault_tolerant_tests/remote_monitoring_fault_tolerant_tests.sh
@@ -51,7 +51,7 @@ function get_kruize_pod_log() {
 
 	echo ""
 	echo "Fetch the kruize pod logs and store in ${log}..."
-	kruize_pod=$(kubectl get pod -n ${NAMESPACE} | grep kruize | grep -v kruize-ui | cut -d " " -f1)
+	kruize_pod=$(kubectl get pod -n ${NAMESPACE} | grep kruize | grep -v kruize-ui | grep -v kruize-db | cut -d " " -f1)
 	kubectl logs -f ${kruize_pod} -n ${NAMESPACE} > ${log} 2>&1 &
 }
 

diff --git a/tests/scripts/remote_monitoring_tests/stress_test/remote_monitoring_stress_test.sh b/tests/scripts/remote_monitoring_tests/stress_test/remote_monitoring_stress_test.sh
@@ -58,7 +58,7 @@ function get_kruize_pod_log() {
 
 	echo ""
 	echo "Fetch the kruize pod logs and store in ${log}..."
-	kruize_pod=$(kubectl get pod -n ${NAMESPACE} | grep kruize | grep -v kruize-ui | cut -d " " -f1)
+	kruize_pod=$(kubectl get pod -n ${NAMESPACE} | grep kruize | grep -v kruize-ui | grep -v kruize-db | cut -d " " -f1)
 	kubectl logs -f ${kruize_pod} -n ${NAMESPACE} > ${log} 2>&1 &
 }