From: Javier Bértoli <jbertoli@curii.com>
Date: Thu, 24 Mar 2022 17:56:33 +0000 (-0300)
Subject: 18638: Address review comments
X-Git-Tag: 2.4.0~25^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c7b3cdf926cc33413a3b3fdea207efd6516ed518

18638: Address review comments

Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli@curii.com>
---

diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index f9fbc8b686..53b67c6cd8 100755
--- a/tools/salt-install/provision.sh
+++ b/tools/salt-install/provision.sh
@@ -417,11 +417,13 @@ for f in $(ls "${SOURCE_PILLARS_DIR}"/*); do
   "${f}" > "${P_DIR}"/$(basename "${f}")
 done
 
-if [ "x${TEST}" = "xyes" ]; then
-  if [ ! -d "${SOURCE_TESTS_DIR}" ]; then
-    echo "You requested to run tests, but ${SOURCE_TESTS_DIR} does not exist or is not a directory. Exiting."
-    exit 1
+if [ ! -d "${SOURCE_TESTS_DIR}" ]; then
+  echo "WARNING: The tests directory was not copied to \"${SOURCE_TESTS_DIR}\"."
+  if [ "x${TEST}" = "xyes" ]; then
+    echo "WARNING: Disabling tests for this installation."
   fi
+  TEST="no"
+else
   mkdir -p ${T_DIR}
   # Replace cluster and domain name in the test files
   for f in $(ls "${SOURCE_TESTS_DIR}"/*); do