feat: getting CVMFS locations from pilot_newSchema

DIRACGrid · Nov 3, 2023 · 1aa64eb · 1aa64eb
1 parent b023dbf
commit 1aa64eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/Pilot/pilotTools.py b/Pilot/pilotTools.py
@@ -1195,6 +1195,10 @@ 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.
+        self.log.debug("CVMFS locations: %s" % self.CVMFS_locations)
+
+
     def getPilotOptionsDict(self):
         """
         Get pilot option dictionary by searching paths in a certain order (commands, logging etc.).

diff --git a/tests/CI/pilot_newSchema.json b/tests/CI/pilot_newSchema.json
@@ -112,7 +112,8 @@
 			"UploadPath": "/gridpp/pilotlogs/",
 			"RemoteLoggerTimerInterval": 0,
 			"LoggingShifterName": "GridPPLogManager",
-			"PilotLogLevel": "DEBUG"
+			"PilotLogLevel": "DEBUG",
+			"CVMFS_locations": ["/cvmfs/grid.cern.ch", "/cvmfs/dirac.egi.eu"]
 		}
 	},
 	"dteam": {
@@ -127,7 +128,8 @@
 			"RemoteLogging": "True",
 			"RemoteLoggerURL": "https://lbcertifdirac70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging",
 			"RemoteLoggerTimerInterval": 0,
-			"PilotLogLevel": "DEBUG"
+			"PilotLogLevel": "DEBUG",
+			"CVMFS_locations": ["/cvmfs/grid.cern.ch", "/cvmfs/dirac.egi.eu"]
 		}
 	},
 	"LHCb": {
@@ -139,7 +141,8 @@
 			"GenericPilotDN": "VAR_USERDN",
 			"RemoteLogging": "False",
 			"RemoteLoggerTimerInterval": 0,
-			"PilotLogLevel": "DEBUG"
+			"PilotLogLevel": "DEBUG",
+			"CVMFS_locations": ["/cvmfs/lhcb.cern.ch/", "$VO_LHCB_SW_DIR"]
 		}
 	},
 	"ConfigurationServers": [