From ed8e3f8e604d07c10a5712a3897f2bca62645787 Mon Sep 17 00:00:00 2001
From: Senthil Kumaran <senthilx@amazon.com>
Date: Wed, 23 Oct 2024 17:50:49 -0700
Subject: [PATCH] Fix test run scripts. (#3088)

---
 scripts/lib/canary.sh            | 4 +---
 scripts/lib/cluster.sh           | 4 +---
 scripts/lib/performance_tests.sh | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/scripts/lib/canary.sh b/scripts/lib/canary.sh
index 361a1c55a5..9cc4df3583 100644
--- a/scripts/lib/canary.sh
+++ b/scripts/lib/canary.sh
@@ -4,9 +4,7 @@
 
 SECONDS=0
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$SCRIPT_DIR"/set_kubeconfig.sh
-
+source "$SCRIPT_DIR"/lib/set_kubeconfig.sh
 
 echo "Running tests for amazon-vpc-cni-k8s with the following variables
 KUBECONFIG:  $KUBECONFIG
diff --git a/scripts/lib/cluster.sh b/scripts/lib/cluster.sh
index c952d13fad..0c375ce569 100644
--- a/scripts/lib/cluster.sh
+++ b/scripts/lib/cluster.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-source "$SCRIPT_DIR"/set_kubeconfig.sh
-
+source "$SCRIPT_DIR"/lib/set_kubeconfig.sh
 
 function load_cluster_details() {
   echo "loading cluster details $CLUSTER_NAME"
diff --git a/scripts/lib/performance_tests.sh b/scripts/lib/performance_tests.sh
index 3e340468c9..1333a414e0 100644
--- a/scripts/lib/performance_tests.sh
+++ b/scripts/lib/performance_tests.sh
@@ -43,7 +43,7 @@ function check_for_slow_performance() {
 
     # Divided by 3 to get current average, multiply past averages by 5/4 to get 25% window
     # Checks if current average is greater than or equal to 15 seconds to avoid failing due to fast previous runs
-    if [[$((CURRENT_DURATION_UP_SUM / 3)) -ge 15] && [ $((CURRENT_DURATION_UP_SUM / 3)) -gt $((PAST_PERFORMANCE_UP_AVERAGE * 5 / 4)) ]]; then
+    if [[ $((CURRENT_DURATION_UP_SUM / 3)) -ge 15 ]] && [[ $((CURRENT_DURATION_UP_SUM / 3)) -gt $((PAST_PERFORMANCE_UP_AVERAGE * 5 / 4)) ]]; then
         echo "FAILURE! Performance test pod UPPING took >25% longer than the past three tests"
         echo "This tests time: $((CURRENT_DURATION_UP_SUM / 3))"
         echo "Previous tests' time: ${PAST_PERFORMANCE_UP_AVERAGE}"