[v7r3] Replace singularity with apptainer

dirac.cfg

@@ -457,16 +457,16 @@ Resources
 
     }
 
-    Singularity
+    Apptainer
     {
 
       # The root image location for the container to use
       # Default: /cvmfs/cernvm-prod.cern.ch/cvm4
       ContainerRoot = /cvmfs/cernvm-prod.cern.ch/cvm4
 
       # The binary to start the container
-      # default: singularity
-      ContainerBin = /opt/extras/bin/singularity
+      # default: apptainer
+      ContainerBin = /opt/extras/bin/apptainer
 
       # List of directories to bind
       ContainerBind = /etc/grid-security,someDir:::BoundHere

docs/source/AdministratorGuide/Configuration/ConfReference/Resources/Sites/index.rst

@@ -51,9 +51,9 @@ This sub-subsection specifies the attributes of each particular CE of the site.
 +----------------------------------------------------+-------------------------------------------------------------+--------------------------------+
 | *<CE_NAME>/LocalCEType*                            | Type of 'Inner' CE, normally empty. Default = "InProcess".  | LocalCEType = Pool             |
 |                                                    | Possibilities: potentially all CE types, but in practice    |                                |
-|                                                    | the most valid would be: InProcess, Sudo, Singularity, Pool.|                                |
+|                                                    | the most valid would be: InProcess, Sudo, Apptainer, Pool.  |                                |
 |                                                    | Pool CE in turn uses InProcess (Default)                    |                                |
-|                                                    | or Sudo or Singularity. To specify, use Pool/ce_type.       | LocalCEType = Pool/Singularity |
+|                                                    | or Sudo or Apptainer. To specify, use Pool/ce_type.         | LocalCEType = Pool/Apptainer   |
 |                                                    | This option can also go at the Queue level.                 |                                |
 +----------------------------------------------------+-------------------------------------------------------------+--------------------------------+
 | *<CE_NAME>/OS*                                     | CE operating system in a DIRAC format                       | OS = ScientificLinux_Boron_5.3 |
@@ -106,7 +106,7 @@ This sub-subsection specifies the attributes of each particular CE of the site.
 +----------------------------------------------------+-------------------------------------------------------------+--------------------------------+
 | *<CE_NAME>/Queues/<QUEUE_NAME>/RequiredTag*        | List of required tags that a job to be eligible must have   | RequiredTag = GPU,96RAM        |
 +----------------------------------------------------+-------------------------------------------------------------+--------------------------------+
-| *<CE_NAME>/Queues/<QUEUE_NAME>/LocalCEType*        | Same as *<CE_NAME>/LocalCEType* (see above) but per queue.  | LocalCEType = Pool/Singularity |
+| *<CE_NAME>/Queues/<QUEUE_NAME>/LocalCEType*        | Same as *<CE_NAME>/LocalCEType* (see above) but per queue.  | LocalCEType = Pool/Apptainer   |
 +----------------------------------------------------+-------------------------------------------------------------+--------------------------------+
 
 
@@ -149,7 +149,7 @@ An example for this session follows::
                 MaxTotalJobs = 5000
                 MaxWaitingJobs = 200
                 maxCPUTime = 7776
-                LocalCEType = Pool/Singularity
+                LocalCEType = Pool/Apptainer
                 Tag = MultiProcessor
               }
             }

docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst

@@ -33,11 +33,11 @@ A pilot has, at a minimum, to:
 - configure DIRAC
 - run the JobAgent
 
-A pilot has to run on each and every computing resource type, provided that:
+A pilot has to run on each and every computing resource type, provided that the worker node contains:
 
-- Python 2.6+ on the WN
-- It is an OS onto which we can install a DIRAC client.
-  - if that's not possible, we plan to add support for singularity
+- Python 2.7+
+- Linux distribution with glibc 2.17 or later
+- A x86_64, aarch64 or ppc64le CPU
 
 The same pilot script can be used everywhere.
 

src/DIRAC/ConfigurationSystem/Client/Utilities.py

@@ -320,7 +320,7 @@ def makeNewQueueName(queueName, ceType):
                     tag = queueDict.get("Tag", "")
                     reqTag = queueDict.get("RequiredTag", "")
                     # LocalCEType can be empty (equivalent to "InProcess")
-                    # or "Pool", "Singularity", but also "Pool/Singularity"
+                    # or "Pool", "Apptainer", but also "Pool/Apptainer"
                     localCEType = queueDict.get("LocalCEType", "")
                     try:
                         localCEType_inner = localCEType.split("/")[1]

src/DIRAC/Resources/Cloud/Utilities.py

@@ -300,7 +300,7 @@ def createCloudInitScript(vmParameters, bootstrapParameters):
         "dirac-site": parameters.get("Site"),
         "submit-pool": parameters.get("SubmitPool", ""),
         "ce-name": parameters.get("CEName"),
-        "ce-type": parameters.get("InnerCEType", "Singularity"),
+        "ce-type": parameters.get("InnerCEType", "Apptainer"),
         "image-name": parameters.get("Image"),
         "vm-uuid": parameters.get("VMUUID"),
         "vmtype": parameters.get("VMType"),

src/DIRAC/Resources/Cloud/cloudinit.template

@@ -164,13 +164,12 @@ yum_repos:
 
 packages:
  - cvmfs
- - singularity
 %(extra-packages)s
 
 %(ssh-user)s
 
 runcmd:
- # Allow nested singularity
+ # Allow nested apptainer
  - [ sysctl, user.max_user_namespaces=150000 ]
  # Enable CVMFS
  - [ mkdir, -p, /mnt/cvmfs ]