forward along GLIDEIN_PARROT_TMP

WIPACrepo · May 1, 2017 · e7aa9e5 · e7aa9e5
1 parent 26c28ef
commit e7aa9e5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/glidein_start.sh b/glidein_start.sh
@@ -137,6 +137,13 @@ else
   fi
 fi
 
+# check the parrot tmp
+if [ "x${GLIDEIN_PARROT_TMP}" != "x" ]; then
+    if [ ! -d ${GLIDEIN_PARROT_TMP} ]; then
+        mkdir ${GLIDEIN_PARROT_TMP}
+    fi
+fi
+
 # test for cvmfs
 CVMFS="false"
 if [ -e /cvmfs/icecube.opensciencegrid.org/py2-v1/setup.sh ]; then
@@ -152,6 +159,7 @@ $@
 EOF
     chmod +x $PWD/parrot_job_env.sh
     if /usr/bin/env -i \
+       GLIDEIN_PARROT_TMP=${GLIDEIN_PARROT_TMP} \
        GLIDEIN_PARROT=${PWD}/GLIDEIN_PARROT \
        _CONDOR_SCRATCH_DIR=${PWD} \
        _CONDOR_SLOT="" \

diff --git a/glidein_template/user_job_wrapper.sh b/glidein_template/user_job_wrapper.sh
@@ -78,6 +78,7 @@ if [ "$USE_PARROT" = "y" ] && [ -z "$_CONDOR_JOB_PIDS" ]; then
     # We are calling run_parrot here, which calls parrot_run to run the job.
     if [ ! -e $JOB_WRAPPER ]; then
         exec /usr/bin/env -i \
+           GLIDEIN_PARROT_TMP=${GLIDEIN_PARROT_TMP} \
            GLIDEIN_PARROT=${GLIDEIN_PARROT} \
            _CONDOR_SCRATCH_DIR=${_CONDOR_SCRATCH_DIR} \
            _CONDOR_SLOT=${_CONDOR_SLOT} \
@@ -86,6 +87,7 @@ if [ "$USE_PARROT" = "y" ] && [ -z "$_CONDOR_JOB_PIDS" ]; then
         ${GLIDEIN_PARROT}/run_parrot "$@"
     else
         exec /usr/bin/env -i \
+           GLIDEIN_PARROT_TMP=${GLIDEIN_PARROT_TMP} \
            GLIDEIN_PARROT=${GLIDEIN_PARROT} \
            _CONDOR_SCRATCH_DIR=${_CONDOR_SCRATCH_DIR} \
            _CONDOR_SLOT=${_CONDOR_SLOT} \