Skip to content
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

[sweep:integration] fix: actually using CVMFS for creating the pilot wrapper #7386

Merged
merged 1 commit into from
Jan 8, 2024
Merged

[sweep:integration] fix: actually using CVMFS for creating the pilot wrapper #7386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docs/source/AdministratorGuide/Systems/WorkloadManagement/Pilots/index.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ Inside this section, you should define the following options, and give them a me
Installation = mycfg.cfg # For an optional configuration file, used by the installation script.
PreInstalledEnv = /cvmfs/some/where/specific/bashrc # A specific rc file to source for setting up DIRAC
PreInstalledEnvPrefix = /cvmfs/some/where/ # Location where DIRAC installations can be found. The Pilot will then try and find the following: /cvmfs/some/where/{Version/}{platform}/diracosrc
CVMFS_locations = /cvmfs/some/ # Comma-separated list of locations where DIRAC installations, CAs and CRLs can be found. The Pilot will then try and find the following: /cvmfs/some/{releaseProject}dirac/{Version/}{platform}/diracosrc and /cvmfs/some/etc/grid-security/certificates
CVMFS_locations = /cvmfs/some/ # Comma-separated list of locations where DIRAC installations, CAs and CRLs can be found. The Pilot will then try and find the following: /cvmfs/some/{releaseProject}dirac/{Version/}{platform}/diracosrc and /cvmfs/some/etc/grid-security/certificates. Those same locations will also be used by the Pilot Wrapper to try and find the pilot files in /cvmfs/some/{releaseProject}dirac/pilot/.
# For the Matcher
CheckVersion = False # True by default, if false any version would be accepted at matching level (this is a check done by the WorkloadManagementSystem/Matcher service).

Expand Down
2 changes: 2 additions & 0 deletions src/DIRAC/WorkloadManagementSystem/Agent/SiteDirector.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,12 +1070,14 @@ def _writePilotScript(self, workingDirectory, pilotOptions, proxy=None, pilotExe
self.log.exception("Exception during pilot modules files compression", lException=be)

location = Operations().getValue("Pilot/pilotFileServer", "")
CVMFS_locations = Operations().getValue("Pilot/CVMFS_locations")
localPilot = pilotWrapperScript(
pilotFilesCompressedEncodedDict=pilotFilesCompressedEncodedDict,
pilotOptions=pilotOptions,
pilotExecDir=pilotExecDir,
envVariables=envVariables,
location=location,
CVMFS_locations=CVMFS_locations,
)

return _writePilotWrapperFile(workingDirectory=workingDirectory, localPilot=localPilot)
Expand Down
Loading