echo >&2
echo >&2 "usage: $0 [options] <identifier>"
echo >&2
- echo >&2 " <identifier> Arvados cluster name"
+ echo >&2 " <identifier> Arvados cluster name or single node salt identifier"
echo >&2
echo >&2 "$0 options:"
echo >&2 " -d, --debug Enable debug output"
fi
shift
shift
- ssh -o "ConnectTimeout 5" -o "LogLevel QUIET" $SALT_MASTER sudo salt --out=txt \'*$cluster*\' cmd.run \'$(IFS=\0;echo "$@")\' $E
+ ssh -o "ConnectTimeout 5" -o "LogLevel QUIET" $SALT_MASTER salt --out=txt \'$cluster*\' cmd.run \'$(IFS=\0;echo "$@")\' $E
}
if [[ -z "$SALT_MASTER" ]]; then
exit 1
fi
-run_salt $IDENTIFIER '' 'apt update && apt -y upgrade'
+run_salt "*$IDENTIFIER" '' 'apt update && DEBIAN_FRONTEND=noninteractive apt -y upgrade'
+
+if [[ "$IDENTIFIER" =~ \. ]]; then
+ title "Single node deploy requested, done"
+ exit 0
+fi
title "Loading ARVADOS_API_HOST and ARVADOS_API_TOKEN"
if [[ -f "$HOME/.config/arvados/$IDENTIFIER.arvadosapi.com.conf" ]]; then
fi
title "Found Arvados Standard Docker Images project with uuid $DOCKER_IMAGES_PROJECT"
-VERSION=$(run_salt shell.$IDENTIFIER '' 'apt-cache policy python3-arvados-cwl-runner' | grep Candidate |awk '{print $3}' |cut -f1 -d-)
+VERSION=$(run_salt "shell.$IDENTIFIER" '' 'apt-cache policy python3-arvados-cwl-runner' | grep Candidate |awk '{print $3}' |cut -f1 -d-)
if [[ "$?" != "0" ]] || [[ "$VERSION" == "" ]]; then
title "ERROR: unable to get python3-arvados-cwl-runner version"
fi
set +e
- CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+CLEAN_VERSION=`echo $VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g`
run_salt "shell.$IDENTIFIER" "'{\"ARVADOS_API_HOST\": \"$ARVADOS_API_HOST\", \"ARVADOS_API_TOKEN\": \"$ARVADOS_API_TOKEN\"}'" "arv-keepdocker" |grep -qP "arvados/jobs +$CLEAN_VERSION "
if [[ $? -eq 0 ]]; then
set -e