Skip to content

Commit

Permalink
test: fix after change of flag
Browse files Browse the repository at this point in the history
  • Loading branch information
fstagni committed Oct 31, 2023
1 parent 8e487eb commit e84c995
Show file tree
Hide file tree
Showing 4 changed files with 131 additions and 4 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,9 @@ jobs:
run: |
cd Pilot
export VO_LHCB_SW_DIR=${GITHUB_WORKSPACE}/Pilot
curl https://lhcbdirac.s3.cern.ch/Pilot3/LHCbPilotCommands.py -o LHCbPilotCommands.py
curl https://gitlab.cern.ch/fstagni/LHCbPilot/-/raw/debug/LHCbPilot/LHCbPilotCommands.py -o LHCbPilotCommands.py
cp ../tests/CI/${{ matrix.pilot_schema }} pilot.json
sed -i "s/VAR_JENKINS_SITE/DIRAC.Jenkins.ch/g" pilot.json
sed -i "s/VAR_JENKINS_CE/jenkins-lhcb.cern.ch/g" pilot.json
Expand Down
6 changes: 3 additions & 3 deletions Pilot/tests/Test_simplePilotLogger.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def test_getOptionForPaths(self):
with open(jsonFile, "r") as fp:
jsonDict = json.load(fp)
res = PilotParams.getOptionForPaths(paths, jsonDict)
self.assertEqual(res["RemoteLogging"], "True")
self.assertEqual(res["RemoteLogging"], "False")
self.assertEqual(res["UploadSE"], "UKI-LT2-IC-HEP-disk")
del jsonDict[vo]["Pilot"]["RemoteLogging"] # remove a vo-specific settings, a default value is False:
res = PilotParams.getOptionForPaths(paths, jsonDict)
Expand Down Expand Up @@ -98,8 +98,8 @@ def test_pilotOptions(self, argvmock, mockPaths):
logURL = "https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging"
self.assertEqual(res.get("RemoteLoggerURL"), logURL)
self.assertEqual(pp.loggerURL, logURL)
self.assertEqual(res.get("RemoteLogging"), "True")
self.assertIs(pp.pilotLogging, True)
self.assertEqual(res.get("RemoteLogging"), "False")
self.assertIs(pp.pilotLogging, False)
self.assertEqual(res.get("UploadPath"), "/gridpp/pilotlogs/")
self.assertTrue("Commands" in res)
self.assertEqual(res["Commands"].get(pp.gridCEType), lTESTcommands)
Expand Down
51 changes: 51 additions & 0 deletions Pilot/tests/certs/user/userkey400.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
-----BEGIN RSA PRIVATE KEY-----
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
-----END RSA PRIVATE KEY-----
74 changes: 74 additions & 0 deletions pilot.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
2023-10-31T09:40:37.332559Z DEBUG [PilotParams] Options list: [('-F', '/home/fstagni/Devs/DIRACGrid/Pilot/Pilot/tests/../../tests/CI/pilot_newSchema.json'), ('-N', 'TEST_type_CE'), ('--gridCEType', 'TEST')]
2023-10-31T09:40:37.332799Z DEBUG [PilotParams] JSON file loaded: /home/fstagni/Devs/DIRACGrid/Pilot/Pilot/tests/../../tests/CI/pilot_newSchema.json
2023-10-31T09:40:37.332982Z DEBUG [PilotParams] CE name: TEST_type_CE
2023-10-31T09:40:37.333062Z DEBUG [PilotParams] Setup:
2023-10-31T09:40:37.333106Z DEBUG [PilotParams] GridCEType: TEST
2023-10-31T09:40:37.333191Z DEBUG [PilotParams] PilotOptionsDict {'RemoteLogging': 'False', 'Commands': {'TEST': 'CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements', 'TEST-MP': 'CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements', 'TEST-FULL': 'CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, CheckWNCapabilities, ConfigureSite, ConfigureArchitecture, ConfigureCPURequirements, LaunchAgent', 'LHCb': 'CheckWorkerNode, LHCbInstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements', 'LHCbD': 'CheckWorkerNode, InstallDIRAC, LHCbConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, LHCbConfigureSite, LHCbConfigureArchitecture, LHCbConfigureCPURequirements', 'LHCbDD': 'CheckWorkerNode, InstallDIRAC, ConfigureBasics, RegisterPilot, CheckCECapabilities, LHCbAddCVMFSTags, CheckWNCapabilities, ConfigureSite, LHCbConfigureArchitecture, ConfigureCPURequirements'}, 'Version': 'VAR_DIRAC_VERSION', 'Extensions': 'None', 'CheckVersion': 'False', 'pilotFileServer': 'lbvobox70.cern.ch:8443', 'pilotRepoBranch': 'does_not_matter', 'pilotRepo': 'https://github.com/does_not_matter/Pilot.git', 'GenericPilotGroup': 'gridpp_pilot', 'GenericPilotDN': 'VAR_USERDN_GRIDPP', 'RemoteLoggerURL': 'https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging', 'UploadSE': 'UKI-LT2-IC-HEP-disk', 'UploadPath': '/gridpp/pilotlogs/', 'LoggingShifterName': 'GridPPLogManager', 'PilotLogLevel': 'DEBUG'}
2023-10-31T09:40:37.333235Z DEBUG [PilotParams] JSON: Remote logging: False
2023-10-31T09:40:37.333275Z DEBUG [PilotParams] JSON: Remote logging URL: https://lbvobox70.cern.ch:8443/WorkloadManagement/TornadoPilotLogging
2023-10-31T09:40:37.333310Z DEBUG [PilotParams] JSON: Remote/local logging debug flag: True
2023-10-31T09:40:37.333350Z DEBUG [PilotParams] Selecting commands from JSON for Grid CE type TEST
2023-10-31T09:40:37.333393Z DEBUG [PilotParams] Commands[TEST]: ['CheckWorkerNode', 'InstallDIRAC', 'ConfigureBasics', 'RegisterPilot', 'CheckCECapabilities', 'CheckWNCapabilities', 'ConfigureSite', 'ConfigureArchitecture', 'ConfigureCPURequirements']
2023-10-31T09:40:37.333440Z DEBUG [PilotParams] Version: ['VAR_DIRAC_VERSION'] -> (release) VAR_DIRAC_VERSION
2023-10-31T09:40:37.333475Z DEBUG [PilotParams] Release project:
2023-10-31T09:40:37.335356Z DEBUG [PilotParams] Options list: [('-z', ''), ('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.335424Z DEBUG [PilotParams] JSON file loaded: tests/pilot.json
2023-10-31T09:40:37.335523Z DEBUG [PilotParams] CE name:
2023-10-31T09:40:37.335563Z DEBUG [PilotParams] GridCEType:
2023-10-31T09:40:37.335628Z DEBUG [PilotParams] Commands: ['CheckWorkerNode', 'InstallDIRAC', 'ConfigureBasics', 'RegisterPilot', 'CheckCECapabilities', 'CheckWNCapabilities', 'ConfigureSite', 'ConfigureArchitecture', 'ConfigureCPURequirements', 'LaunchAgent']
2023-10-31T09:40:37.335705Z DEBUG [PilotParams] Commands extesions: []
2023-10-31T09:40:37.335746Z DEBUG [PilotParams] CS list: dips://does.not.matter.org:9162
2023-10-31T09:40:37.335784Z DEBUG [PilotParams] Version: ['integration'] -> integration
2023-10-31T09:40:37.335822Z DEBUG [PilotParams] Release project:
2023-10-31T09:40:37.338287Z DEBUG [PilotParams] Options list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.338348Z DEBUG [PilotParams] JSON file loaded: tests/pilot.json
2023-10-31T09:40:37.338431Z DEBUG [PilotParams] CE name:
2023-10-31T09:40:37.338472Z DEBUG [PilotParams] GridCEType:
2023-10-31T09:40:37.338513Z DEBUG [PilotParams] Commands: ['CheckWorkerNode', 'InstallDIRAC', 'ConfigureBasics', 'RegisterPilot', 'CheckCECapabilities', 'CheckWNCapabilities', 'ConfigureSite', 'ConfigureArchitecture', 'ConfigureCPURequirements', 'LaunchAgent']
2023-10-31T09:40:37.338553Z DEBUG [PilotParams] Commands extesions: []
2023-10-31T09:40:37.338592Z DEBUG [PilotParams] CS list: dips://does.not.matter.org:9162
2023-10-31T09:40:37.338629Z DEBUG [PilotParams] Version: ['integration'] -> integration
2023-10-31T09:40:37.338665Z DEBUG [PilotParams] Release project:
2023-10-31T09:40:37.338747Z DEBUG [CommandBase] Initialized command CommandBase
2023-10-31T09:40:37.338790Z DEBUG [CommandBase] pilotParams option list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.339081Z INFO [CommandBase] Executing command dummy
2023-10-31T09:40:37.339788Z DEBUG [CommandBase] Return code of dummy: 1
2023-10-31T09:40:37.340349Z DEBUG [PilotParams] Options list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.340398Z DEBUG [PilotParams] JSON file loaded: tests/pilot.json
2023-10-31T09:40:37.340481Z DEBUG [PilotParams] CE name:
2023-10-31T09:40:37.340520Z DEBUG [PilotParams] GridCEType:
2023-10-31T09:40:37.340560Z DEBUG [PilotParams] Commands: ['CheckWorkerNode', 'InstallDIRAC', 'ConfigureBasics', 'RegisterPilot', 'CheckCECapabilities', 'CheckWNCapabilities', 'ConfigureSite', 'ConfigureArchitecture', 'ConfigureCPURequirements', 'LaunchAgent']
2023-10-31T09:40:37.340599Z DEBUG [PilotParams] Commands extesions: []
2023-10-31T09:40:37.340638Z DEBUG [PilotParams] CS list: dips://does.not.matter.org:9162
2023-10-31T09:40:37.340675Z DEBUG [PilotParams] Version: ['integration'] -> integration
2023-10-31T09:40:37.340711Z DEBUG [PilotParams] Release project:
2023-10-31T09:40:37.340787Z DEBUG [CommandBase] Initialized command CommandBase
2023-10-31T09:40:37.340829Z DEBUG [CommandBase] pilotParams option list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.340875Z INFO [CommandBase] Executing command dummy
2023-10-31T09:40:37.341053Z DEBUG [CommandBase] Return code of dummy: 1
2023-10-31T09:40:37.341700Z DEBUG [PilotParams] Options list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.341748Z DEBUG [PilotParams] JSON file loaded: tests/pilot.json
2023-10-31T09:40:37.341825Z DEBUG [PilotParams] CE name:
2023-10-31T09:40:37.341864Z DEBUG [PilotParams] GridCEType:
2023-10-31T09:40:37.341904Z DEBUG [PilotParams] Commands: ['CheckWorkerNode', 'InstallDIRAC', 'ConfigureBasics', 'RegisterPilot', 'CheckCECapabilities', 'CheckWNCapabilities', 'ConfigureSite', 'ConfigureArchitecture', 'ConfigureCPURequirements', 'LaunchAgent']
2023-10-31T09:40:37.341942Z DEBUG [PilotParams] Commands extesions: []
2023-10-31T09:40:37.341980Z DEBUG [PilotParams] CS list: dips://does.not.matter.org:9162
2023-10-31T09:40:37.342016Z DEBUG [PilotParams] Version: ['integration'] -> integration
2023-10-31T09:40:37.342052Z DEBUG [PilotParams] Release project:
2023-10-31T09:40:37.342126Z DEBUG [CommandBase] Initialized command CommandBase
2023-10-31T09:40:37.342168Z DEBUG [CommandBase] pilotParams option list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.342214Z INFO [CommandBase] Executing command dummy
2023-10-31T09:40:37.342345Z DEBUG [CommandBase] Return code of dummy: 1
2023-10-31T09:40:37.343309Z DEBUG [PilotParams] Options list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.343357Z DEBUG [PilotParams] JSON file loaded: tests/pilot.json
2023-10-31T09:40:37.343475Z DEBUG [PilotParams] CE name:
2023-10-31T09:40:37.343533Z DEBUG [PilotParams] GridCEType:
2023-10-31T09:40:37.343622Z DEBUG [PilotParams] Commands: ['CheckWorkerNode', 'InstallDIRAC', 'ConfigureBasics', 'RegisterPilot', 'CheckCECapabilities', 'CheckWNCapabilities', 'ConfigureSite', 'ConfigureArchitecture', 'ConfigureCPURequirements', 'LaunchAgent']
2023-10-31T09:40:37.343698Z DEBUG [PilotParams] Commands extesions: []
2023-10-31T09:40:37.343776Z DEBUG [PilotParams] CS list: dips://does.not.matter.org:9162
2023-10-31T09:40:37.343852Z DEBUG [PilotParams] Version: ['integration'] -> integration
2023-10-31T09:40:37.343889Z DEBUG [PilotParams] Release project:
2023-10-31T09:40:37.343969Z DEBUG [CommandBase] Initialized command CommandBase
2023-10-31T09:40:37.344012Z DEBUG [CommandBase] pilotParams option list: [('-d', ''), ('-g', 'dummyURL'), ('-F', 'tests/pilot.json')]
2023-10-31T09:40:37.344061Z INFO [CommandBase] Executing command dummy
2023-10-31T09:40:37.344259Z DEBUG [CommandBase] Return code of dummy: 1

0 comments on commit e84c995

Please sign in to comment.