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@veritasgenetics.com>

diff --git a/jenkins/run-deploy.sh b/jenkins/run-deploy.sh
index a018a0474a66bf3f0781c4908483b6c433436a80..d7708d88ea3c40bace574ccff905a33e93ed5a21 100755 (executable)
--- 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
 `