[ARVADOS-DEV] updated: 1f416e4347fc8a32dbc5725aa24406cb1b6b2d5d

[Git user]

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

       via  1f416e4347fc8a32dbc5725aa24406cb1b6b2d5d (commit)
      from  3e5c277f88aa20f031a6df4fa29604fe68978ad3 (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 1f416e4347fc8a32dbc5725aa24406cb1b6b2d5d
Author: Ward Vandewege <ward at jhvc.com>
Date:   Thu Apr 23 21:06:32 2020 -0400

    Improve grepping for the docker image to avoid false positives.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at jhvc.com>

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 023b4b3..0289e22 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -332,7 +332,7 @@ if [[ "$NODE" == "" ]]; then
   fi
 
   if [[ "$SHELL_NODE_FOR_ARV_KEEPDOCKER" == "" ]]; then
-    ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker |grep -q $VERSION
+    ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker |grep -qP "arvados/jobs +$VERSION "
     if [[ $? -eq 0 ]]; then
       title "Found latest arvados/jobs Docker image, nothing to upload"
       # Just in case it isn't yet, tag the image as latest
@@ -358,7 +358,7 @@ if [[ "$NODE" == "" ]]; then
       fi
     fi
   else
-    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker" |grep -q $VERSION
+    ssh -t -p$SSH_PORT -o "StrictHostKeyChecking no" -o "ConnectTimeout 125" $SHELL_NODE_FOR_ARV_KEEPDOCKER "ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv-keepdocker" |grep -qP "arvados/jobs +$VERSION "
 
     if [[ $? -eq 0 ]]; then
       title "Found latest arvados/jobs Docker image, nothing to upload"

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


hooks/post-receive
--