Merge pull request #7663 from aldbr/cherry-pick-2-725cd3a41-integration

[sweep:integration] Deprecate ARC and ARC6

src/DIRAC/ConfigurationSystem/Client/Utilities.py

@@ -248,7 +248,7 @@ def makeNewQueueName(queueName, ceType):
                     if newCEType:
                         break
                 if newCEType == "ARC-CE":
-                    newCEType = "ARC"
+                    newCEType = "AREX"
 
                 newRAM = ceInfo.get("GlueHostMainMemoryRAMSize", "").strip()
                 # Protect from unreasonable values
@@ -260,11 +260,7 @@ def makeNewQueueName(queueName, ceType):
                 addToChangeSet((ceSection, "OS", OS, newOS), changeSet)
                 addToChangeSet((ceSection, "SI00", si00, newsi00), changeSet)
 
-                if (newCEType == "ARC6" and ceType in ("AREX",)) or (newCEType == "AREX" and ceType in ("ARC6",)):
-                    # preserve manually chosen AREX or ARC6 setting
-                    pass
-                else:
-                    addToChangeSet((ceSection, "CEType", ceType, newCEType), changeSet)
+                addToChangeSet((ceSection, "CEType", ceType, newCEType), changeSet)
 
                 addToChangeSet((ceSection, "MaxRAM", ram, newRAM), changeSet)
 

src/DIRAC/Core/Utilities/Glue2.py

@@ -220,25 +220,18 @@ def __getGlue2ShareInfo(host, shareInfoLists):
             try:
                 if not shareEndpoints and shareInfoDict["GLUE2ShareID"].startswith("urn:ogf"):
                     exeInfo = dict(exeInfo)  # silence pylint about tuples
-                    isCEType = dict(arex=False, arc=False)
                     computingInfo = shareInfoDict["GLUE2ComputingShareComputingEndpointForeignKey"]
                     computingInfo = computingInfo if isinstance(computingInfo, list) else [computingInfo]
                     for entry in computingInfo:
-                        if "gridftpjob" in entry:
-                            # has an entry like
-                            # urn:ogf:ComputingEndpoint:ce01.tier2.hep.manchester.ac.uk:gridftpjob:gsiftp://ce01.tier2.hep.manchester.ac.uk:2811/jobs
-                            isCEType["arc"] = True
                         if "emies" in entry:
                             # has an entry like
                             # urn:ogf:ComputingEndpoint:ce01.tier2.hep.manchester.ac.uk:emies:https://ce01.tier2.hep.manchester.ac.uk:443/arex
-                            isCEType["arex"] = True
-                    if isCEType["arex"]:  # preferred solution AREX
-                        queueInfo["GlueCEImplementationName"] = "AREX"
-                    elif isCEType["arc"]:  # use ARC6 now, instead of ARC (5)
-                        queueInfo["GlueCEImplementationName"] = "ARC6"
+                            queueInfo["GlueCEImplementationName"] = "AREX"
+                            break
                     else:
-                        sLog.error("Neither ARC nor AREX for", siteName)
+                        sLog.error("No AREX for", siteName)
                         raise AttributeError()
+
                     exeInfo = dict(exeInfo)  # silence pylint about tuples
                     managerName = exeInfo.pop("MANAGER", "").split(" ", 1)[0].rsplit(":", 1)[1]
                     managerName = managerName.capitalize() if managerName == "condor" else managerName

src/DIRAC/ResourceStatusSystem/Command/DowntimeCommand.py

@@ -184,7 +184,7 @@ def _prepareCommand(self):
             )
             if ceType == "HTCondorCE":
                 gOCDBServiceType = "org.opensciencegrid.htcondorce"
-            elif ceType in ["ARC", "ARC6", "AREX"]:
+            elif ceType == "AREX":
                 gOCDBServiceType = "ARC-CE"
 
         return S_OK((element, elementName, hours, gOCDBServiceType))