sweep: DIRACGrid#7531 fix: removed option for python3 pilots

chaen · Mar 22, 2024 · 73ba720 · 73ba720
1 parent 0a2a2d7
commit 73ba720
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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",
 )