[ARVADOS-DEV] created: 390242cf4b224f7a08cda08ff4e3a14cba851d3e

[Git user]

        at  390242cf4b224f7a08cda08ff4e3a14cba851d3e (commit)


commit 390242cf4b224f7a08cda08ff4e3a14cba851d3e
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Oct 25 16:31:46 2016 -0400

    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..62cacad 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -224,7 +224,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"

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


hooks/post-receive
--