fix: more setup removals

fstagni · fstagni · commit 36c1b328e094 · 2024-11-29T15:29:41.000+01:00
diff --git a/src/DIRAC/Core/Base/AgentModule.py b/src/DIRAC/Core/Base/AgentModule.py
@@ -1,24 +1,25 @@
 """
   Base class for all agent modules
 """
+import datetime
+import importlib.metadata
+import inspect
 import os
+import signal
 import threading
 import time
-import signal
-import importlib.metadata
-import inspect
-import datetime
+
 import psutil
 
 import DIRAC
-from DIRAC import S_OK, S_ERROR, gConfig, gLogger, rootPath
-from DIRAC.Core.Utilities.File import mkDir
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger, rootPath
+from DIRAC.ConfigurationSystem.Client import PathFinder
+from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.Core.Utilities import Network, TimeUtilities
-from DIRAC.Core.Utilities.Shifter import setupShifterProxyInEnv
+from DIRAC.Core.Utilities.File import mkDir
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure
-from DIRAC.ConfigurationSystem.Client import PathFinder
+from DIRAC.Core.Utilities.Shifter import setupShifterProxyInEnv
 from DIRAC.Core.Utilities.ThreadScheduler import gThreadScheduler
-from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 
 
 class AgentModule:
@@ -68,7 +69,6 @@ def __init__(self, agentName, loadName, baseAgentName=False, properties={}):
         They are used to populate __codeProperties
 
         The following Options are used from the Configuration:
-        - /DIRAC/Setup
         - Status
         - Enabled
         - PollingTime            default = 120
@@ -113,7 +113,6 @@ def __init__(self, agentName, loadName, baseAgentName=False, properties={}):
             "loadSection": PathFinder.getAgentSection(loadName),
             "cyclesDone": 0,
             "totalElapsedTime": 0,
-            "setup": gConfig.getValue("/DIRAC/Setup", "Unknown"),
             "alive": True,
         }
         self.__moduleProperties["system"], self.__moduleProperties["agentName"] = agentName.split("/")
@@ -201,7 +200,6 @@ def am_initialize(self, *initArgs):
         self.log.notice("=" * 40)
         self.log.notice(f"Loaded agent module {self.__moduleProperties['fullName']}")
         self.log.notice(f" Site: {DIRAC.siteName()}")
-        self.log.notice(f" Setup: {gConfig.getValue('/DIRAC/Setup')}")
         self.log.notice(f" Agent version: {self.__codeProperties['version']}")
         self.log.notice(f" DIRAC version: {DIRAC.version}")
         self.log.notice(f" DIRAC platform: {DIRAC.getPlatform()}")
diff --git a/src/DIRAC/Core/Base/ExecutorModule.py b/src/DIRAC/Core/Base/ExecutorModule.py
@@ -3,10 +3,11 @@
     Just provides a number of functions used by all executors
 """
 import os
-from DIRAC import S_OK, S_ERROR, gConfig, gLogger, rootPath
+
+from DIRAC import S_ERROR, S_OK, gConfig, gLogger, rootPath
 from DIRAC.ConfigurationSystem.Client import PathFinder
-from DIRAC.Core.Utilities.Shifter import setupShifterProxyInEnv
 from DIRAC.Core.Utilities.ReturnValues import isReturnStructure
+from DIRAC.Core.Utilities.Shifter import setupShifterProxyInEnv
 
 
 class ExecutorModule:
@@ -21,7 +22,6 @@ def _ex_initialize(cls, exeName, loadName):
             "loadSection": PathFinder.getExecutorSection(loadName),
             "messagesProcessed": 0,
             "reconnects": 0,
-            "setup": gConfig.getValue("/DIRAC/Setup", "Unknown"),
         }
         cls.__defaults = {}
         cls.__defaults["MonitoringEnabled"] = True
diff --git a/src/DIRAC/DataManagementSystem/scripts/dirac_admin_allow_se.py b/src/DIRAC/DataManagementSystem/scripts/dirac_admin_allow_se.py
@@ -50,7 +50,7 @@ def main():
             site = switch[1]
 
     # imports
-    from DIRAC import gConfig, gLogger
+    from DIRAC import gLogger
     from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
     from DIRAC.ConfigurationSystem.Client.Helpers.Resources import getSites
     from DIRAC.Core.Security.ProxyInfo import getProxyInfo
@@ -68,11 +68,6 @@ def main():
 
     ses = resolveSEGroup(ses)
     diracAdmin = DiracAdmin()
-    errorList = []
-    setup = gConfig.getValue("/DIRAC/Setup", "")
-    if not setup:
-        print("ERROR: Could not contact Configuration Service")
-        DIRAC.exit(2)
 
     res = getProxyInfo()
     if not res["OK"]:
diff --git a/src/DIRAC/DataManagementSystem/scripts/dirac_admin_ban_se.py b/src/DIRAC/DataManagementSystem/scripts/dirac_admin_ban_se.py
@@ -58,19 +58,15 @@ def main():
             sites = switch[1].split(",")
 
     # from DIRAC.ConfigurationSystem.Client.CSAPI           import CSAPI
-    from DIRAC import gConfig, gLogger
+    from DIRAC import gLogger
     from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
     from DIRAC.Core.Security.ProxyInfo import getProxyInfo
+    from DIRAC.DataManagementSystem.Utilities.DMSHelpers import DMSHelpers, resolveSEGroup
     from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
     from DIRAC.ResourceStatusSystem.Client.ResourceStatus import ResourceStatus
-    from DIRAC.DataManagementSystem.Utilities.DMSHelpers import resolveSEGroup, DMSHelpers
 
     ses = resolveSEGroup(ses)
     diracAdmin = DiracAdmin()
-    setup = gConfig.getValue("/DIRAC/Setup", "")
-    if not setup:
-        print("ERROR: Could not contact Configuration Service")
-        DIRAC.exit(2)
 
     res = getProxyInfo()
     if not res["OK"]:
diff --git a/src/DIRAC/Interfaces/scripts/dirac_admin_allow_site.py b/src/DIRAC/Interfaces/scripts/dirac_admin_allow_site.py
@@ -22,9 +22,10 @@ def main():
     Script.registerArgument("Comment:  Reason of the action")
     Script.parseCommandLine(ignoreErrors=True)
 
-    from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
+    from DIRAC import exit as DIRACExit
+    from DIRAC import gLogger
     from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
-    from DIRAC import exit as DIRACExit, gConfig, gLogger
+    from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
 
     def getBoolean(value):
         if value.lower() == "true":
@@ -42,11 +43,6 @@ def getBoolean(value):
     diracAdmin = DiracAdmin()
     exitCode = 0
     errorList = []
-    setup = gConfig.getValue("/DIRAC/Setup", "")
-    if not setup:
-        print("ERROR: Could not contact Configuration Service")
-        exitCode = 2
-        DIRACExit(exitCode)
 
     # result = promptUser(
     #     'All the elements that are associated with this site will be active, '
@@ -70,10 +66,9 @@ def getBoolean(value):
                 exitCode = 2
                 DIRACExit(exitCode)
             userName = userName["Value"]
-            subject = f"{site} is added in site mask for {setup} setup"
-            body = "Site {} is added to the site mask for {} setup by {} on {}.\n\n".format(
+            subject = f"{site} is added in site mask"
+            body = "Site {} is added to the site mask by {} on {}.\n\n".format(
                 site,
-                setup,
                 userName,
                 time.asctime(),
             )
diff --git a/src/DIRAC/Interfaces/scripts/dirac_admin_ban_site.py b/src/DIRAC/Interfaces/scripts/dirac_admin_ban_site.py
@@ -22,10 +22,10 @@ def main():
     Script.registerArgument("Comment:  Reason of the action")
     Script.parseCommandLine(ignoreErrors=True)
 
-    from DIRAC import exit as DIRACExit, gConfig, gLogger
-    from DIRAC.Core.Utilities.PromptUser import promptUser
-    from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
+    from DIRAC import exit as DIRACExit
+    from DIRAC import gLogger
     from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
+    from DIRAC.Interfaces.API.DiracAdmin import DiracAdmin
 
     def getBoolean(value):
         if value.lower() == "true":
@@ -43,11 +43,6 @@ def getBoolean(value):
     diracAdmin = DiracAdmin()
     exitCode = 0
     errorList = []
-    setup = gConfig.getValue("/DIRAC/Setup", "")
-    if not setup:
-        print("ERROR: Could not contact Configuration Service")
-        exitCode = 2
-        DIRACExit(exitCode)
 
     # result = promptUser(
     #     'All the elements that are associated with this site will be banned,'
@@ -71,10 +66,9 @@ def getBoolean(value):
                 exitCode = 2
                 DIRACExit(exitCode)
             userName = userName["Value"]
-            subject = f"{site} is banned for {setup} setup"
-            body = "Site {} is removed from site mask for {} setup by {} on {}.\n\n".format(
+            subject = f"{site} is banned"
+            body = "Site {} is removed from site mask by {} on {}.\n\n".format(
                 site,
-                setup,
                 userName,
                 time.asctime(),
             )
diff --git a/src/DIRAC/Resources/Computing/SingularityComputingElement.py b/src/DIRAC/Resources/Computing/SingularityComputingElement.py
@@ -175,8 +175,6 @@ def __getInstallFlags(self, infoDict=None):
         setup = infoDict.get("DefaultSetup")
         if not setup:
             setup = list(infoDict.get("Setups"))[0]
-        if not setup:
-            setup = gConfig.getValue("/DIRAC/Setup", "unknown")
         setup = str(setup)
 
         diracProject = "DIRAC"
@@ -205,8 +203,6 @@ def __getConfigFlags(infoDict=None):
         cfgOpts = []
 
         setup = infoDict.get("DefaultSetup")
-        if not setup:
-            setup = gConfig.getValue("/DIRAC/Setup", "unknown")
         cfgOpts.append(f"-S '{setup}'")
 
         csServers = infoDict.get("ConfigurationServers")
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/PushJobAgent.py b/src/DIRAC/WorkloadManagementSystem/Agent/PushJobAgent.py
@@ -571,13 +571,6 @@ def _submitJobWrapper(
         # Dump the remote CFG config into the job directory: it is needed for the JobWrapperTemplate
         cfgFilename = Path(job.jobIDPath) / "dirac.cfg"
         gConfig.dumpRemoteCFGToFile(cfgFilename)
-        # -----------------------------------------------------------------------------------------------
-        # Temporary hack: in v9.0, the DIRAC/Setup is meant to be removed from the configuration
-        # Until then, we need to set it manually
-        cfg = CFG().loadFromFile(cfgFilename)
-        cfg.setOption("DIRAC/Setup", gConfig.getOption("DIRAC/Setup", "")["Value"])
-        cfg.writeToFile(cfgFilename)
-        # -----------------------------------------------------------------------------------------------
 
         # Generate a light JobWrapper executor script
         jobDesc = {
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
@@ -610,12 +610,7 @@ def _getPilotOptions(self, queue: str) -> list[str]:
         queueDict = self.queueDict[queue]["ParametersDict"]
         pilotOptions = []
 
-        setup = gConfig.getValue("/DIRAC/Setup", "unknown")
-        if setup == "unknown":
-            self.log.error("Setup is not defined in the configuration")
-            return []
-        pilotOptions.append(f"-S {setup}")
-        opsHelper = Operations(vo=self.vo, setup=setup)
+        opsHelper = Operations(vo=self.vo)
 
         # Installation defined?
         installationName = opsHelper.getValue("Pilot/Installation", "")
diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py
@@ -11,9 +11,8 @@
 
 from DIRAC import S_OK, gConfig, gLogger
 from DIRAC.ConfigurationSystem.Client import ConfigurationData
-from DIRAC.ResourceStatusSystem.Client.SiteStatus import SiteStatus
 from DIRAC.ResourceStatusSystem.Client.ResourceStatus import ResourceStatus
-
+from DIRAC.ResourceStatusSystem.Client.SiteStatus import SiteStatus
 from DIRAC.WorkloadManagementSystem.Agent.SiteDirector import SiteDirector
 from DIRAC.WorkloadManagementSystem.Client import PilotStatus
 
@@ -258,7 +257,6 @@ def test_getNumberOfJobsNeedingPilots(sd, mocker):
 
 def test_getPilotWrapper(mocker, sd, pilotWrapperDirectory):
     """Get pilot options for a specific queue and check the result, then generate the pilot wrapper"""
-    mocker.patch("DIRAC.WorkloadManagementSystem.Agent.SiteDirector.gConfig.getValue", return_value="TestSetup")
 
     # Get pilot options
     pilotOptions = sd._getPilotOptions("ce1.site1.com_condor")
@@ -268,7 +266,6 @@ def test_getPilotWrapper(mocker, sd, pilotWrapperDirectory):
         "-n LCG.Site1.com",
         "-N ce1.site1.com",
         "-Q condor",
-        "-S TestSetup",
         "-V 123",
         "-l 123",
         "-e 1,2,3",
diff --git a/src/DIRAC/WorkloadManagementSystem/JobWrapper/test/Test_JobWrapper.py b/src/DIRAC/WorkloadManagementSystem/JobWrapper/test/Test_JobWrapper.py
@@ -1,16 +1,16 @@
 """ Test class for JobWrapper
 """
 import os
-from pathlib import Path
 import shutil
 import tempfile
 import time
+from pathlib import Path
 from unittest.mock import MagicMock
 
 import pytest
 
 import DIRAC
-from DIRAC import gLogger, S_OK
+from DIRAC import S_OK, gLogger
 from DIRAC.Core.Utilities import DErrno
 from DIRAC.Core.Utilities.ReturnValues import S_ERROR
 from DIRAC.DataManagementSystem.Client.test.mock_DM import dm_mock
@@ -19,7 +19,6 @@
 from DIRAC.WorkloadManagementSystem.JobWrapper.JobExecutionCoordinator import JobExecutionCoordinator
 from DIRAC.WorkloadManagementSystem.JobWrapper.JobWrapper import JobWrapper
 
-
 gLogger.setLevel("DEBUG")
 
 # -------------------------------------------------------------------------------------------------
@@ -229,7 +228,7 @@ def test_processSuccessfulDiracJobExec(mocker):
         jw.outputFile = std_out.name
         jw.errorFile = std_err.name
         result = jw.process(
-            command=f"{executable} {os.path.dirname(os.path.abspath(__file__))}/jobDescription.xml --o /DIRAC/Setup=Test",
+            command=f"{executable} {os.path.dirname(os.path.abspath(__file__))}/jobDescription.xml",
             env={},
         )
 
@@ -573,7 +572,7 @@ def test_postProcess_subprocess_not_complete(setup_job_wrapper, mocker, mock_rep
         ("script-RESC.sh", None, "src/DIRAC/WorkloadManagementSystem/JobWrapper/test/", "Going to reschedule job"),
         (
             "src/DIRAC/WorkloadManagementSystem/scripts/dirac_jobexec.py",
-            "src/DIRAC/WorkloadManagementSystem/JobWrapper/test/jobDescription.xml -o /DIRAC/Setup=Test",
+            "src/DIRAC/WorkloadManagementSystem/JobWrapper/test/jobDescription.xml",
             None,
             "Application Finished Successfully",
         ),
diff --git a/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py b/src/DIRAC/WorkloadManagementSystem/Utilities/PilotCStoJSONSynchronizer.py
@@ -4,20 +4,20 @@
   these are incorporated to the file.
   The module uploads to a web server the latest version of the pilot scripts.
 """
-import os
+import datetime
 import glob
+import os
 import shutil
 import tarfile
-import datetime
 from typing import Any
 
 from git import Repo
 
-from DIRAC import gLogger, gConfig, S_OK
+from DIRAC import S_OK, gConfig, gLogger
 from DIRAC.ConfigurationSystem.Client.ConfigurationData import gConfigurationData
 from DIRAC.ConfigurationSystem.Client.Helpers.Operations import Operations
 from DIRAC.ConfigurationSystem.Client.Helpers.Path import cfgPath
-from DIRAC.Core.Utilities.ReturnValues import DReturnType, DOKReturnType
+from DIRAC.Core.Utilities.ReturnValues import DOKReturnType, DReturnType
 
 
 class PilotCStoJSONSynchronizer:
@@ -40,7 +40,6 @@ def __init__(self):
         # pilot sync default parameters
         self.pilotRepo = "https://github.com/DIRACGrid/Pilot.git"  # repository of the pilot
         self.pilotVORepo = ""  # repository of the VO that can contain a pilot extension
-        self.pilotSetup = gConfig.getValue("/DIRAC/Setup", "")
         self.projectDir = ""
         # where the find the pilot scripts in the VO pilot repository
         self.pilotScriptPath = "Pilot"  # where the find the pilot scripts in the pilot repository
@@ -87,7 +86,7 @@ def getCSDict(self, includeMasterCS: bool = True) -> DReturnType[Any]:
         pilotDict.update(opRes["Value"])
 
         # we still need a pilotVOVersion
-        self.opsHelper = Operations(setup=self.pilotSetup)
+        self.opsHelper = Operations()
         self.pilotVOVersion = self.opsHelper.getValue("/Pilot/Version")
         # if self.pilotVORepo is defined and self.pilotVOVersion is not, syncScripts is likely to fail.
         if self.pilotVOVersion is None and self.pilotVORepo:
diff --git a/tests/Jenkins/utilities.sh b/tests/Jenkins/utilities.sh
