[ARVADOS] updated: 2.1.0-2160-gf416c6e03
Git user
git at public.arvados.org
Thu Mar 24 18:45:25 UTC 2022
Summary of changes:
tools/salt-install/provision.sh | 50 ++++++++++++++++++++++-------------------
1 file changed, 27 insertions(+), 23 deletions(-)
via f416c6e0370c78a9aa18c2e461e0861b404a669a (commit)
via c7b3cdf926cc33413a3b3fdea207efd6516ed518 (commit)
via d294969f9be42b8f5d4d50a5e8395580915def15 (commit)
from 926f71e8481d62a20ff66a834d876713df5fd0c7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit f416c6e0370c78a9aa18c2e461e0861b404a669a
Merge: 926f71e84 c7b3cdf92
Author: Javier Bértoli <jbertoli at curii.com>
Date: Thu Mar 24 15:44:43 2022 -0300
Merge branch '18638-noisy-errors-regarding-tests'
closes #18638
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
commit c7b3cdf926cc33413a3b3fdea207efd6516ed518
Author: Javier Bértoli <jbertoli at curii.com>
Date: Thu Mar 24 14:56:33 2022 -0300
18638: Address review comments
Arvados-DCO-1.1-Signed-off-by: Javier Bértoli <jbertoli at curii.com>
diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh
index f9fbc8b68..53b67c6cd 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list