This is an automated email from the ASF dual-hosted git repository.

joemcdonnell pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/impala.git

commit 53da1e737bf2c9684913765a859abe34d4c1a8bc
Author: Joe McDonnell <[email protected]>
AuthorDate: Thu Sep 8 15:01:43 2022 -0700

    IMPALA-11569: Run finalize.sh in all-tests.sh even if dataload fails
    
    bin/jenkins/all-tests.sh does not run finalize.sh if
    bin/bootstrap_development.sh fails. This is inconvenient,
    because sometimes Impala can crash during dataload, and
    it is useful for finalize.sh to resolve any minidumps.
    
    This changes all-tests.sh to run finalize.sh even if
    bootstrap_development.sh fails.
    
    Testing:
     - Ran this on an ARM job that was failing during
       dataload. Finalize ran properly.
    
    Change-Id: I46fcc1d552341607ada9a6c37f6a5fb13be213a5
    Reviewed-on: http://gerrit.cloudera.org:8080/18955
    Reviewed-by: Michael Smith <[email protected]>
    Reviewed-by: Wenzhe Zhou <[email protected]>
    Tested-by: Joe McDonnell <[email protected]>
---
 bin/jenkins/all-tests.sh | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/bin/jenkins/all-tests.sh b/bin/jenkins/all-tests.sh
index 3f6f1a38a..c6a4e9a9c 100644
--- a/bin/jenkins/all-tests.sh
+++ b/bin/jenkins/all-tests.sh
@@ -60,7 +60,12 @@ then
   trap "kill -i $KILLER_PID" EXIT
 fi
 
-source bin/bootstrap_development.sh
+RET_CODE=0
+if ! bin/bootstrap_development.sh; then
+  RET_CODE=1
+fi
+
+source bin/impala-config.sh
 
 # Sanity check: bootstrap_development.sh should not have modified any of
 # the Impala files. This is important for the continued functioning of
@@ -71,16 +76,17 @@ if [[ "${NUM_MODIFIED_FILES}" -ne 0 ]]; then
   echo "Dumping diff:"
   git status --porcelain --untracked-files=no
   git --no-pager diff
-  exit 1
+  RET_CODE=1
 fi
 
-RET_CODE=0
-if ! bin/run-all-tests.sh; then
-  RET_CODE=1
+# Skip tests if build/dataload failed
+if [[ $RET_CODE -eq 0 ]]; then
+  if ! bin/run-all-tests.sh; then
+    RET_CODE=1
+  fi
 fi
 
-# Shutdown minicluster at the end
+# Always shutdown minicluster at the end and run finalize.sh
 testdata/bin/kill-all.sh
-
 bin/jenkins/finalize.sh
 exit $RET_CODE

Reply via email to