From 73ba720a01223f959f2a1287274d6ac56f2a3d30 Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Fri, 22 Mar 2024 10:08:28 +0100 Subject: [PATCH] sweep: #7531 fix: removed option for python3 pilots --- .../scripts/dirac_production_runjoblocal.py | 2 +- src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py | 2 -- .../Agent/test/Test_Agent_SiteDirector.py | 1 - .../Test_GenerateAndExecutePilotWrapper.py | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py b/src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py index b3542f90974..7738ee0a45d 100755 --- a/src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py +++ b/src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py @@ -85,7 +85,7 @@ def __configurePilot(basepath, vo): os.system( "python " + basepath - + "dirac-pilot.py -S %s -l %s -C %s -N ce.debug.ch -Q default -n DIRAC.JobDebugger.ch --pythonVersion=3 -dd" + + "dirac-pilot.py -S %s -l %s -C %s -N ce.debug.ch -Q default -n DIRAC.JobDebugger.ch -dd" % (currentSetup, vo, masterCS) ) diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py index bb54f35b4d4..4e17d4aea76 100644 --- a/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py +++ b/src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py @@ -641,8 +641,6 @@ def _getPilotOptions(self, queue: str) -> list[str]: elif CVMFS_locations: pilotOptions.append(f"--CVMFS_locations={CVMFS_locations}") - pilotOptions.append("--pythonVersion=3") - # DIRAC Extensions to be used in pilots pilotExtensionsList = opsHelper.getValue("Pilot/Extensions", []) extensionsList = [] diff --git a/src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py b/src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py index 55c71da79b9..d005cf3bd87 100644 --- a/src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py +++ b/src/DIRAC/WorkloadManagementSystem/Agent/test/Test_Agent_SiteDirector.py @@ -251,7 +251,6 @@ def test_getPilotWrapper(mocker, sd, pilotWrapperDirectory): pilotOptions = sd._getPilotOptions("ce1.site1.com_condor") assert { "--preinstalledEnv=123", - "--pythonVersion=3", "--wnVO=dteam", "-n LCG.Site1.com", "-N ce1.site1.com", diff --git a/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py b/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py index af020553f34..653d5ad6d48 100644 --- a/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py +++ b/tests/Integration/WorkloadManagementSystem/Test_GenerateAndExecutePilotWrapper.py @@ -51,7 +51,7 @@ from PilotWrapper import pilotWrapperScript # pylint: disable=import-error res = pilotWrapperScript( - pilotOptions="--setup=CI -N ce.dirac.org -Q DIRACQUEUE -n DIRAC.CI.ORG --pythonVersion=3 --debug", + pilotOptions="--setup=CI -N ce.dirac.org -Q DIRACQUEUE -n DIRAC.CI.ORG --debug", location="diracproject.web.cern.ch/diracproject/tars/Pilot/DIRAC/" + pilotBranch + "/,wrong.cern.ch", )