From 2efd88cf64130bb0ebb0549d30053b85baaae2f9 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 28 Jun 2022 12:28:02 -0400 Subject: [PATCH] 18870: Check for 'fixme's Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- tools/salt-install/installer.sh | 9 ++++++++- tools/salt-install/provision.sh | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/salt-install/installer.sh b/tools/salt-install/installer.sh index 17890d646e..79c85c89c1 100755 --- a/tools/salt-install/installer.sh +++ b/tools/salt-install/installer.sh @@ -40,6 +40,7 @@ deploynode() { loadconfig() { CONFIG_FILE=local.params + CONFIG_DIR=local_config_dir if [[ ! -s $CONFIG_FILE ]] ; then echo "Must be run from initialized setup dir, maybe you need to 'initialize' first?" fi @@ -102,10 +103,16 @@ case "$subcmd" in loadconfig - set -x + if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then + echo + echo "Some parameters still need to be updated. Please fix them and then re-run deploy." + exit 1 + fi BRANCH=$(git branch --show-current) + set -x + git add -A if ! git diff --cached --exit-code ; then git commit -m"prepare for deploy" diff --git a/tools/salt-install/provision.sh b/tools/salt-install/provision.sh index da3ef88a82..f4660be370 100755 --- a/tools/salt-install/provision.sh +++ b/tools/salt-install/provision.sh @@ -257,7 +257,7 @@ if [ ! -d ${CONFIG_DIR} ]; then exit 1 fi -if grep -q 'fixme_or_this_wont_work' ${CONFIG_FILE} ; then +if grep -rni 'fixme' ${CONFIG_FILE} ${CONFIG_DIR} ; then echo >&2 "The config file ${CONFIG_FILE} has some parameters that need to be modified." echo >&2 "Please, fix them and re-run the provision script." exit 1 -- 2.30.2