Tweak version number parsing (again).
authorWard Vandewege <ward@curii.com>
Fri, 16 Oct 2020 14:57:49 +0000 (10:57 -0400)
committerWard Vandewege <ward@curii.com>
Fri, 16 Oct 2020 14:57:49 +0000 (10:57 -0400)
refs #16982

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>

jenkins/run-deploy.sh

index 9d8ff3496cb3065b7ce4f36151b757f29b47108a..16e9ee35111eff61c513246a52d9fb219aab0252 100755 (executable)
@@ -361,7 +361,7 @@ if [[ "$NODE" == "" ]]; then
     fi
 
     set +e
-    CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+    CLEAN_VERSION=`echo $VERSION |sed -e 's/~/./'`
     ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" -o "LogLevel QUIET" $SHELL_NODE_FOR_ARV_KEEPDOCKER "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