fix: removed option for python3 pilots

chaen · Mar 21, 2024 · fad898f · fad898f
1 parent 13cd7f9
commit fad898f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git a/src/DIRAC/Resources/Cloud/cloudinit.template b/src/DIRAC/Resources/Cloud/cloudinit.template
@@ -97,7 +97,6 @@ write_files:
  curl -o pilot.json -k https://%(pilot-server)s/pilot/pilot.json
  fi
  python dirac-pilot.py \
- --pythonVersion=3 \
  --setup %(setup)s \
  -r %(release-version)s \
  --MaxCycles %(max-cycles)s \

diff --git a/src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py b/src/DIRAC/TransformationSystem/scripts/dirac_production_runjoblocal.py
@@ -84,7 +84,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
@@ -1039,8 +1039,6 @@ def _getPilotOptions(self, queue, **kwargs):
  if opsHelper.getValue("/Services/JobMonitoring/usePilotsLoggingFlag", False):
  pilotOptions.append("-z ")
 
- pilotOptions.append("--pythonVersion=3")
-
  # Debug
  if self.pilotLogLevel.lower() == "debug":
  pilotOptions.append("-ddd")

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",
 )