[ARVADOS-DEV] updated: 2ae4f10e9dbc4ddafcd693a3c781f05da8bc8351

[Git user]

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

       via  2ae4f10e9dbc4ddafcd693a3c781f05da8bc8351 (commit)
      from  7f53d7ff02a7adb96c07a48e1da3ba90813c28fe (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 2ae4f10e9dbc4ddafcd693a3c781f05da8bc8351
Author: Ward Vandewege <wvandewege at veritasgenetics.com>
Date:   Fri Sep 13 09:55:12 2019 -0400

    run-deploy fixes:
    
    * when getting GIT_COMMIT, exclude stderr
    * unload RVM before running puppet
    
    refs #15630
    
    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 a018a04..d7708d8 100755
--- a/jenkins/run-deploy.sh
+++ b/jenkins/run-deploy.sh
@@ -99,6 +99,7 @@ EXITCODE=0
 COLUMNS=80
 
 PUPPET_AGENT='
+__rvm_unload
 now() { date +%s; }
 let endtime="$(now) + 600"
 while [ "$endtime" -gt "$(now)" ]; do
@@ -276,9 +277,9 @@ if [[ "$NODE" == "" ]]; then
 	# 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
+  /usr/share/python2.7/dist/python-arvados-cwl-runner/bin/python -c 'import arvados_cwl ; print arvados_cwl.__version__'
 else
-  /usr/bin/python -c 'import arvados_cwl ; print arvados_cwl.__version__' 2>&1 |grep -v INFO:rdflib:RDFLib
+  /usr/bin/python -c 'import arvados_cwl ; print arvados_cwl.__version__'
 fi
 EOF
 `

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


hooks/post-receive
--