[ARVADOS-DEV] updated: 30ff03b92cde79c2ae59097d0105cb9ad75286f4

[Git user]

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

       via  30ff03b92cde79c2ae59097d0105cb9ad75286f4 (commit)
      from  302f17bb8bed388f4dafc16b2dbbff77c7213e5f (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 30ff03b92cde79c2ae59097d0105cb9ad75286f4
Author: Ward Vandewege <ward at curii.com>
Date:   Wed Dec 16 14:04:40 2020 -0500

    Do not run arv-keepdocker on every shell node, just on the main shell
    node.
    
    refs #16925
    
    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 c890d1e..37e9f4f 100755
--- a/jenkins/run-deploy-salt.sh
+++ b/jenkins/run-deploy-salt.sh
@@ -100,7 +100,7 @@ function run_salt() {
   fi
   shift
   shift
-  ssh -o "ConnectTimeout 5" -o "LogLevel QUIET" $SALT_MASTER salt --out=txt \'*$cluster*\' cmd.run \'$(IFS=\0;echo "$@")\' $E
+  ssh -o "ConnectTimeout 5" -o "LogLevel QUIET" $SALT_MASTER salt --out=txt \'$cluster*\' cmd.run \'$(IFS=\0;echo "$@")\' $E
 }
 
 if [[ -z "$SALT_MASTER" ]]; then
@@ -108,7 +108,7 @@ if [[ -z "$SALT_MASTER" ]]; then
   exit 1
 fi
 
-run_salt $IDENTIFIER '' 'apt update && DEBIAN_FRONTEND=noninteractive apt -y upgrade'
+run_salt "*$IDENTIFIER" '' 'apt update && DEBIAN_FRONTEND=noninteractive apt -y upgrade'
 
 title "Loading ARVADOS_API_HOST and ARVADOS_API_TOKEN"
 if [[ -f "$HOME/.config/arvados/$IDENTIFIER.arvadosapi.com.conf" ]]; then
@@ -138,7 +138,7 @@ if [[ "$DOCKER_IMAGES_PROJECT" == "" ]]; then
 fi
 
 title "Found Arvados Standard Docker Images project with uuid $DOCKER_IMAGES_PROJECT"
-VERSION=$(run_salt shell.$IDENTIFIER '' 'apt-cache policy python3-arvados-cwl-runner' | grep Candidate |awk '{print $3}' |cut -f1 -d-)
+VERSION=$(run_salt "shell.$IDENTIFIER" '' 'apt-cache policy python3-arvados-cwl-runner' | grep Candidate |awk '{print $3}' |cut -f1 -d-)
 
 if [[ "$?" != "0" ]] || [[ "$VERSION" == "" ]]; then
   title "ERROR: unable to get python3-arvados-cwl-runner version"

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


hooks/post-receive
--