print command in CI

scality · Dec 23, 2024 · e7ce40e · e7ce40e
1 parent 042a729
commit e7ce40e
Show file tree

Hide file tree

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

diff --git a/.github/scripts/e2e_tests_brownfield_use_case.sh b/.github/scripts/e2e_tests_brownfield_use_case.sh
@@ -22,8 +22,8 @@ error_handler() {
 # Trap errors and call the error handler
 trap 'error_handler' ERR
 
-# Log command execution to the log file for debugging
 log_and_run() {
+  echo "Running: $*" | tee -a "$LOG_FILE"
   "$@" 2>&1 | tee -a "$LOG_FILE"
 }
 

diff --git a/.github/scripts/e2e_tests_greenfield_use_case.sh b/.github/scripts/e2e_tests_greenfield_use_case.sh
@@ -32,9 +32,12 @@ error_handler() {
 # Trap errors and call the error handler
 trap 'error_handler' ERR
 
-# Log command execution to the log file for debugging
 log_and_run() {
-  "$@" 2>&1 | tee -a "$LOG_FILE"
+  echo "Running: $*" | 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
@@ -17,6 +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 ! "$@" 2>&1 | tee -a "$LOG_FILE"; then
     echo "Error: Command failed - $*" | tee -a "$LOG_FILE"
     exit 1