COSI-53: update-cmds-to-print-in-github-ui-and-log

scality · Jan 2, 2025 · 9c4e7f0 · 9c4e7f0
1 parent 0404900
commit 9c4e7f0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.github/scripts/cleanup_cosi_resources.sh b/.github/scripts/cleanup_cosi_resources.sh
@@ -14,7 +14,7 @@ trap 'error_handler' ERR
 
 log_and_run() {
   echo "Running: $*" | tee -a "$LOG_FILE"
-  "$@" | tee -a "$LOG_FILE"
+  "$@" 2>&1 | tee -a "$LOG_FILE"
 }
 
 log_and_run echo "Removing COSI driver manifests and namespace..."

diff --git a/.github/scripts/e2e_tests_greenfield_use_case.sh b/.github/scripts/e2e_tests_greenfield_use_case.sh
@@ -35,7 +35,10 @@ trap 'error_handler' ERR
 # Log command execution to the log file for debugging
 log_and_run() {
   echo "Running: $*" | tee -a "$LOG_FILE"
-  "$@" | tee -a "$LOG_FILE"
+  if ! "$@" 2>&1 | tee -a "$LOG_FILE"; then
+    echo "Error: Command failed - $*" | tee -a "$LOG_FILE"
+    exit 1
+  fi
 }
 
 # Step 1: Create Account in Vault

diff --git a/.github/scripts/setup_cosi_resources.sh b/.github/scripts/setup_cosi_resources.sh
@@ -18,7 +18,7 @@ trap 'error_handler' ERR
 # Log command execution to the log file for debugging
 log_and_run() {
   echo "Running: $*" | tee -a "$LOG_FILE"
-  if ! "$@" | tee -a "$LOG_FILE"; then
+  if ! "$@" 2>&1 | tee -a "$LOG_FILE"; then
     echo "Error: Command failed - $*" | tee -a "$LOG_FILE"
     exit 1
   fi