Skip to content

set DIRACSYSCONFIG env variable to pilot.cfg #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fstagni merged 2 commits into from
Jan 5, 2021
Merged

set DIRACSYSCONFIG env variable to pilot.cfg #122

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f95d361
set DIRACSYSCONFIG env variable to pilot.cfg
fstagni Dec 3, 2020
4f8bf9c
restore
fstagni Jan 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Pilot/pilotCommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ def __init__(self, pilotParams):
self.pp.rootPath = self.pp.pilotRootPath
self.installScriptName = 'dirac-install.py'
self.installScript = ''
# This command is a "must-do", so it's assumed that the variable below is set
self.pp.installEnv['DIRACSYSCONFIG'] = 'pilot.cfg'

def _setInstallOptions(self):
""" Setup installation parameters
Expand Down Expand Up @@ -929,7 +931,6 @@ def __setInnerCEOpts(self):

# The file pilot.cfg has to be created previously by ConfigureDIRAC
if self.pp.localConfigFile:
self.innerCEOpts.append(' -o /AgentJobRequirements/ExtraOptions=%s' % self.pp.localConfigFile)
if LooseVersion(self.pp.releaseVersion) >= self.cfgOptionDIRACVersion:
self.innerCEOpts.append('--cfg')
self.innerCEOpts.append(self.pp.localConfigFile)
Expand Down Expand Up @@ -1032,7 +1033,6 @@ def __setInProcessOpts(self):

# The file pilot.cfg has to be created previously by ConfigureDIRAC
if self.pp.localConfigFile:
self.inProcessOpts.append(' -o /AgentJobRequirements/ExtraOptions=%s' % self.pp.localConfigFile)
if LooseVersion(self.pp.releaseVersion) >= self.cfgOptionDIRACVersion:
self.inProcessOpts.append('--cfg')
self.inProcessOpts.append(self.pp.localConfigFile)
Expand Down