From 7a735b2bf82cd3e5ee8044600130a904d5f77aaf Mon Sep 17 00:00:00 2001
From: shubham-yb <shubhamdabriwala01@gmail.com>
Date: Tue, 7 Jan 2025 08:43:07 +0000
Subject: [PATCH] Cleanup

---
 migtests/scripts/functions.sh              | 14 ++++++++++++++
 migtests/scripts/upgrade-and-run-after.sh  | 10 ----------
 migtests/scripts/upgrade-and-run-before.sh | 10 ----------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/migtests/scripts/functions.sh b/migtests/scripts/functions.sh
index 257ccfb133..8dd015b03f 100644
--- a/migtests/scripts/functions.sh
+++ b/migtests/scripts/functions.sh
@@ -1095,4 +1095,18 @@ verify_voyager_version() {
         echo "Error: yb-voyager version mismatch. Expected: $expected_version, Got: ${actual_version:-'Unknown'}."
         return 1
     fi
+}
+
+run_script() {
+    local script_file=$1
+    if [ -f "${script_file}" ]; then
+        step "Running script: ${script_file}"
+        source "${script_file}"
+        if [ $? -ne 0 ]; then
+            echo "Error: Script ${script_file} returned an error. Exiting."
+            return 1
+        fi
+    else
+        echo "Script ${script_file} not found, skipping."
+    fi
 }
\ No newline at end of file
diff --git a/migtests/scripts/upgrade-and-run-after.sh b/migtests/scripts/upgrade-and-run-after.sh
index dce2a0dc8e..8b60a64c1e 100755
--- a/migtests/scripts/upgrade-and-run-after.sh
+++ b/migtests/scripts/upgrade-and-run-after.sh
@@ -42,16 +42,6 @@ if [ -n "${SOURCE_DB_SSL_MODE}" ]; then
    export TARGET_DB_NAME="${TARGET_DB_NAME}_ssl"
 fi
 
-run_script() {
-    local script_file=$1
-    if [ -f "${script_file}" ]; then
-        step "Running script: ${script_file}"
-        source "${script_file}"
-    else
-        echo "Script ${script_file} not found, skipping."
-    fi
-}
-
 main() {
     echo ${REPO_ROOT}
 
diff --git a/migtests/scripts/upgrade-and-run-before.sh b/migtests/scripts/upgrade-and-run-before.sh
index b0509d58b7..16ba4ca75e 100755
--- a/migtests/scripts/upgrade-and-run-before.sh
+++ b/migtests/scripts/upgrade-and-run-before.sh
@@ -42,16 +42,6 @@ if [ -n "${SOURCE_DB_SSL_MODE}" ]; then
    export TARGET_DB_NAME="${TARGET_DB_NAME}_ssl"
 fi
 
-run_script() {
-    local script_file=$1
-    if [ -f "${script_file}" ]; then
-        step "Running script: ${script_file}"
-        source "${script_file}"
-    else
-        echo "Script ${script_file} not found, skipping."
-    fi
-}
-
 main() {
     echo ${REPO_ROOT}
     echo "Deleting and recreating export-dir."