remove duplicate log from scipts

scality · Dec 22, 2024 · 042a729 · 042a729
1 parent b3ebaaf
commit 042a729
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/.github/scripts/cleanup_cosi_resources.sh b/.github/scripts/cleanup_cosi_resources.sh
@@ -13,8 +13,7 @@ error_handler() {
 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
@@ -34,8 +34,7 @@ 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"
+  "$@" 2>&1 | tee -a "$LOG_FILE"
 }
 
 # Step 1: Create Account in Vault

diff --git a/.github/scripts/setup_cosi_resources.sh b/.github/scripts/setup_cosi_resources.sh
@@ -17,8 +17,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