[ARVADOS-DEV] updated: 91ea2ad5cd1ecf9128d43225e39034f5a114feee

Git user git at public.curoverse.com
Thu May 2 15:01:18 UTC 2019


Summary of changes:
 jenkins/run-deploy.sh | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

       via  91ea2ad5cd1ecf9128d43225e39034f5a114feee (commit)
      from  87893087e8933ca8e72ce3dc089ad487e67120fc (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 91ea2ad5cd1ecf9128d43225e39034f5a114feee
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Thu May 2 11:00:48 2019 -0400

    run-deploy.sh should also handle pre-1.4 installations.
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <wvandewege at veritasgenetics.com>

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index 671cc68..9e599cd 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -272,7 +272,16 @@ if [[ "$NODE" == "" ]]; then
   fi
 
   title "Found Arvados Standard Docker Images project with uuid $DOCKER_IMAGES_PROJECT"
-  GIT_COMMIT=`ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "/usr/share/python2.7/dist/python-arvados-cwl-runner/bin/python -c 'import arvados_cwl ; print arvados_cwl.__version__'" 2>&1 |grep -v INFO:rdflib:RDFLib`
+
+	# from 1.4 onwards, we use the python executable that is part of the python-arvados-cwl-runner package
+  GIT_COMMIT=`ssh -o "StrictHostKeyChecking no" shell.$IDENTIFIER "bash -s" <<EOF
+if [[ -e "/usr/share/python2.7/dist/python-arvados-cwl-runner/bin/python" ]]; then
+  /usr/share/python2.7/dist/python-arvados-cwl-runner/bin/python -c 'import arvados_cwl ; print arvados_cwl.__version__' 2>&1 |grep -v INFO:rdflib:RDFLib
+else
+  /usr/bin/python -c 'import arvados_cwl ; print arvados_cwl.__version__' 2>&1 |grep -v INFO:rdflib:RDFLib
+fi
+EOF
+`
 
   if [[ "$?" != "0" ]] || [[ "$GIT_COMMIT" == "" ]]; then
     title "ERROR: unable to get arvados/jobs Docker image git revision"

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list