Adding X509 transfer support

Author: Maria A

lumberjack/bin/lumberjack_start.sh

@@ -34,7 +34,6 @@ if [[ ${HTC_ROLE} == *"CentralManager"* ]]; then
   SINGULARITY_IMAGE="htcondor_centralmgr_lumberjack.sif"
   test -e $JOB_QUEUE_FILE || (echo "Job queue file does not exist" ; exit 1)
   echo "I am a central manager, writing my info at ${PWD}/90_central_mgr_info"
-  env
   n=`printf %05d $COBALT_PARTNAME`
   MY_NODEID="nid$n"
   cat >${PWD}/90_central_mgr <<EOF
@@ -60,7 +59,7 @@ echo "$timestamp Configuring CVMFS, if successful, start HTCondor"
 #    singularity run --env JOB_QUEUE_FILE=/srv/job_queue.log --env SPOOL_DIR=${SPOOL_DIR} --env LOG_DIR=${LOG_DIR} --bind /etc/hosts --bind /projects/HEPCloud-FNAL/job_area/${SLOT_PREFIX}:/srv --bind /cvmfs --bind ${SSD_SCRATCH} --home /srv ${SSD_SCRATCH}/${SINGULARITY_IMAGE}
 #    singularity instance start --containall --bind /etc/hosts --bind ${PWD}/${SLOT_PREFIX}/local_dir:/srv --bind ${PWD}/${SLOT_PREFIX}/condor:/etc/condor --hostname ${CONTAINER_NAME} /root/fnalhpc_startd/lumberjack/singularity/${SINGULARITY_IMAGE} ${CONTAINER_NAME}
     echo "singularity run --containall --bind /etc/hosts --bind local_dir:/srv --bind condor:/etc/condor /projects/HEPCloud-FNAL/containers/${SINGULARITY_IMAGE}"
-    singularity --debug --verbose run --containall --bind /etc/hosts --bind local_dir:/srv --bind condor:/etc/condor /projects/HEPCloud-FNAL/containers/${SINGULARITY_IMAGE}
+    singularity run --containall --bind /etc/hosts --bind local_dir:/srv --bind condor:/etc/condor /projects/HEPCloud-FNAL/containers/${SINGULARITY_IMAGE}
 } || 
 {
     echo "$timestamp Startd or cvmfsexec exited with errors, stopping local squid and cleaning up"

lumberjack/bin/minicondor_hpc_submit

@@ -137,6 +137,10 @@ do
     FILE_LIST="${FILE_LIST},"\"$file\"
 #    echo "scp root@${ORIG_SCHEDD_HOST}:${ORIG_IWD}/$file ${NEWLOC}"
 done
+
+ORIG_X509=$(grep -wR 'x509userproxy' job_queue.log | awk '{print $4}' | sort -u | awk -F/ '{print $NF}' | tr -d \")
+FILE_LIST="${FILE_LIST},"\"${ORIG_X509}\"
+
 echo -e "${MGT}# Tips:"
 echo "To pull the files from the local(HPC) login node, first make sure that there is networking connectivity between the login node and the remote schedd via SSH (port 22), files will be copied via 'scp'. If both networking and authentication via ssh are possible from the login node to the remote Schedd, this script will automatically atemmpt to run the following scp command and pull the necessary files:" | fold | awk '{ print "\t" $0 }'
 echo ""
@@ -215,4 +219,4 @@ echo Submitting COBALT job
 # Submit cobalt job
 cd ${THETA_BASE_DIR}; qsub -A ${ALLOCATION} -q ${QUEUE} -t ${TIME} -n ${NODE_CNT} --jobname=${SLOT_PREFIX} --attr ssds=required:enable_ssh=1 job.cobalt
 echo ""
-echo Done!!! check your job and files at ${THETA_BASE_DIR}
+echo Done.. Check your job and files at ${THETA_BASE_DIR}