Skip to content

Commit

Permalink
fix: CVMFS locations comes as a string
Browse files Browse the repository at this point in the history
  • Loading branch information
fstagni committed Feb 28, 2024
1 parent 37e5a3c commit f58f6cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion Pilot/pilotTools.py
Original file line number Diff line number Diff line change
Expand Up @@ -1278,7 +1278,8 @@ def __initJSON2(self):
self.releaseProject = pilotOptions.get("Project", self.releaseProject) # default from the code.
self.log.debug("Release project: %s" % self.releaseProject)

self.CVMFS_locations = pilotOptions.get("CVMFS_locations", self.CVMFS_locations) # default from the code.
if "CVMFS_locations" in pilotOptions:
self.CVMFS_locations = pilotOptions["CVMFS_locations"].replace(" ", "").split(",")
self.log.debug("CVMFS locations: %s" % self.CVMFS_locations)


Expand Down
6 changes: 3 additions & 3 deletions tests/CI/pilot_newSchema.json
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
"RemoteLoggerTimerInterval": 0,
"LoggingShifterName": "GridPPLogManager",
"PilotLogLevel": "DEBUG",
"CVMFS_locations": ["/cvmfs/grid.cern.ch", "/cvmfs/dirac.egi.eu"]
"CVMFS_locations": "/cvmfs/grid.cern.ch, /cvmfs/dirac.egi.eu"
}
},
"dteam": {
Expand All @@ -130,7 +130,7 @@
"RemoteLoggerURL": "https://lbcertifdirac70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging",
"RemoteLoggerTimerInterval": 0,
"PilotLogLevel": "DEBUG",
"CVMFS_locations": ["/cvmfs/grid.cern.ch", "/cvmfs/dirac.egi.eu"]
"CVMFS_locations": "/cvmfs/grid.cern.ch, /cvmfs/dirac.egi.eu"
}
},
"LHCb": {
Expand All @@ -143,7 +143,7 @@
"RemoteLogging": "False",
"RemoteLoggerTimerInterval": 0,
"PilotLogLevel": "DEBUG",
"CVMFS_locations": ["/cvmfs/lhcb.cern.ch/", "$VO_LHCB_SW_DIR"]
"CVMFS_locations": "/cvmfs/lhcb.cern.ch/, $VO_LHCB_SW_DIR"
}
},
"ConfigurationServers": [
Expand Down

0 comments on commit f58f6cd

Please sign in to comment.