[ARVADOS-DEV] updated: 5f5e1d894d1becba5cddae85d017c5d576ecd53c

[Git user]

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

       via  5f5e1d894d1becba5cddae85d017c5d576ecd53c (commit)
      from  3d57e4066cf615cfcf223e29c3a26fbd76ec755f (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 5f5e1d894d1becba5cddae85d017c5d576ecd53c
Author: Ward Vandewege <ward at curii.com>
Date:   Fri Oct 16 11:14:19 2020 -0400

    Tweak version number parsing, taking release clients into account.
    
    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 a14ce0a..c09bb27 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 |sed -e 's/~/./'`
+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
diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 16e9ee3..5c7ad83 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 |sed -e 's/~/./'`
+    CLEAN_VERSION=`echo $VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g`
     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
@@ -361,7 +361,7 @@ if [[ "$NODE" == "" ]]; then
     fi
 
     set +e
-    CLEAN_VERSION=`echo $VERSION |sed -e 's/~/./'`
+    CLEAN_VERSION=`echo $VERSION | sed s/~dev/.dev/g | sed s/~rc/rc/g`
     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

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


hooks/post-receive
--