From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Tue, 25 Oct 2016 20:31:46 +0000 (-0400)
Subject: 10194: Make sure to install the version of arvados/jobs that arvados_cwl expects.
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/842a901fa5070c5667db363d9425129a396f30c4?ds=sidebyside

10194: Make sure to install the version of arvados/jobs that arvados_cwl expects.
---

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index db83c2a..8dcf56b 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -207,6 +207,34 @@ if [[ "$ARVADOS_API_HOST" == "" ]] || [[ "$ARVADOS_API_TOKEN" == "" ]]; then
   exit 1
 fi
 
+title "Gathering list of shell and Keep nodes"
+SHELL_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv virtual_machine list |jq .items[].hostname -r`
+KEEP_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv keep_service list |jq .items[].service_host -r`
+
+nodes=""
+for n in workbench manage switchyard $SHELL_NODES $KEEP_NODES; do
+  ECODE=0
+  if [[ $n =~ $ARVADOS_API_HOST$ ]]; then
+    # e.g. keep.qr1hi.arvadosapi.com
+    node=$n
+  else
+    # e.g. shell
+    node=$n.$ARVADOS_API_HOST
+  fi
+  # e.g. keep.qr1hi
+  nodes="$nodes ${node%.arvadosapi.com}"
+done
+
+## at this point nodes should be an array containing
+## manage.qr1hi,  keep.qr1hi, etc
+## that should be defined in the .ssh/config file
+title "Updating in parallel: $nodes"
+export -f run_puppet
+export -f title
+export SSH_PORT
+export PUPPET_AGENT
+echo $nodes|xargs -d " " -n 1 -P 10 -I {} bash -c "run_puppet {}"
+
 title "Locating Arvados Standard Docker images project"
 
 JSON_FILTER="[[\"name\", \"=\", \"Arvados Standard Docker Images\"], [\"owner_uuid\", \"=\", \"$IDENTIFIER-tpzed-000000000000000\"]]"
@@ -224,7 +252,7 @@ if [[ "$DOCKER_IMAGES_PROJECT" == "" ]]; then
 fi
 
 title "Found Arvados Standard Docker Images project with uuid $DOCKER_IMAGES_PROJECT"
-GIT_COMMIT=`ssh -o "StrictHostKeyChecking no" $IDENTIFIER cat /usr/local/arvados/src/git-commit.version`
+GIT_COMMIT=`ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "python -c 'import arvados_cwl ; print arvados_cwl.__version__'"`
 
 if [[ "$?" != "0" ]] || [[ "$GIT_COMMIT" == "" ]]; then
   title "ERROR: unable to get arvados/jobs Docker image git revision"
@@ -250,31 +278,3 @@ else
     exit 1
   fi
 fi
-
-title "Gathering list of shell and Keep nodes"
-SHELL_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv virtual_machine list |jq .items[].hostname -r`
-KEEP_NODES=`ARVADOS_API_HOST=$ARVADOS_API_HOST ARVADOS_API_TOKEN=$ARVADOS_API_TOKEN arv keep_service list |jq .items[].service_host -r`
-
-nodes=""
-for n in workbench manage switchyard $SHELL_NODES $KEEP_NODES; do
-  ECODE=0
-  if [[ $n =~ $ARVADOS_API_HOST$ ]]; then
-    # e.g. keep.qr1hi.arvadosapi.com
-    node=$n
-  else
-    # e.g. shell
-    node=$n.$ARVADOS_API_HOST
-  fi
-  # e.g. keep.qr1hi
-  nodes="$nodes ${node%.arvadosapi.com}"
-done
-
-## at this point nodes should be an array containing
-## manage.qr1hi,  keep.qr1hi, etc
-## that should be defined in the .ssh/config file
-title "Updating in parallel: $nodes"
-export -f run_puppet
-export -f title
-export SSH_PORT
-export PUPPET_AGENT
-echo $nodes|xargs -d " " -n 1 -P 10 -I {} bash -c "run_puppet {}"