Switched to use Singularity image as a base for the compute jobs

Author: rynge

outsource/Outsource.py

@@ -146,7 +146,7 @@ def _generate_dax(self):
             # determine the job requirements based on the data locations
             sites_expression, desired_sites = self._determine_target_sites(rses, stash_raw_path)
 
-            requirements_base = 'OSGVO_OS_STRING == "RHEL 7" && GFAL_VERIFIED && HAS_CVMFS_xenon_opensciencegrid_org && HAS_FILE_lib64_libgcc_s_so_1'
+            requirements_base = 'HAS_SINGULARITY && HAS_CVMFS_xenon_opensciencegrid_org'
             # general compute jobs
             requirements = requirements_base + ' && (' + sites_expression + ')'
             if self._exclude_sites():

outsource/workflow/sites.xml.template

@@ -32,13 +32,18 @@
         <profile namespace="pegasus" key="style" >condor</profile>
         <profile namespace="condor" key="universe" >vanilla</profile>
         <profile namespace="condor" key="request_cpus" >1</profile>
-        <profile namespace="condor" key="request_memory" >1 GB</profile>
-        <profile namespace="condor" key="request_disk" >1 GB</profile>
+        <profile namespace="condor" key="request_disk" >2 GB</profile>
+        <profile namespace="condor" key="request_memory" > ifthenelse(isundefined(DAGNodeRetry) || DAGNodeRetry == 0, 1800, 4000) </profile>
+
+        <!-- always run under singularity -->
+        <profile namespace="condor" key="+SingularityImage" >"/cvmfs/singularity.opensciencegrid.org/opensciencegrid/osgvo-xenon:latest"</profile>
 
         <!-- control the environment -->
         <profile namespace="env" key="PATH">/usr/bin:/bin</profile>
         <profile namespace="env" key="LD_LIBRARY_PATH"></profile>
         <profile namespace="env" key="GLOBUS_LOCATION"></profile>
+
+        <!-- we don't want color/control characters in the outputs -->
         <profile namespace="env" key="RUCIO_LOGGING_FORMAT">%(asctime)s  %(levelname)s  %(message)s</profile>
     </site>