[ARVADOS-DEV] updated: ae141be42b100652901903ab954defe706eea764

[Git user]

Summary of changes:
 jenkins/run-deploy-salt.sh | 2 +-
 jenkins/run-deploy.sh      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

       via  ae141be42b100652901903ab954defe706eea764 (commit)
      from  6a767361889c56e82ee497707b318b595e58a250 (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 ae141be42b100652901903ab954defe706eea764
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Oct 16 10:47:21 2020 -0400

    Tweak version number parsing.
    
    refs #16982
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/jenkins/run-deploy-salt.sh b/jenkins/run-deploy-salt.sh
index bc52dc9..a14ce0a 100755
--- 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 531010f..9d8ff34 100755
--- 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

-----------------------------------------------------------------------


hooks/post-receive
--