Tweak version number parsing.

refs #16982

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

diff --git a/jenkins/run-deploy-salt.sh b/jenkins/run-deploy-salt.sh
index bc52dc9a671f3eba7ffae3bf491e81f508af25d6..a14ce0a1e2f2a554fa63e1e85187f306f4558c94 100755 (executable)
--- a/jenkins/run-deploy-salt.sh
+++ b/jenkins/run-deploy-salt.sh
@@ -148,7 +148,7 @@ else
 fi
 
 set +e
-    CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+CLEAN_VERSION=`echo $VERSION |sed -e 's/~/./'`
 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

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 531010feaba0522ac466f717fa307e21765e7db5..9d8ff3496cb3065b7ce4f36151b757f29b47108a 100755 (executable)
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -335,7 +335,7 @@ if [[ "$NODE" == "" ]]; then
     fi
 
     set +e
-    CLEAN_VERSION=`echo $VERSION |tr -d '~'`
+    CLEAN_VERSION=`echo $VERSION |sed -e 's/~/./'`
     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