diff --git a/reframe/core/schedulers/oar.py b/reframe/core/schedulers/oar.py index 7711e32b28..5b55d2a9aa 100644 --- a/reframe/core/schedulers/oar.py +++ b/reframe/core/schedulers/oar.py @@ -135,10 +135,16 @@ def poll(self, *jobs): jobinfo = {} # Typical oarstat -fj output: + # # https://github.com/oar-team/oar/blob/0fccc4fc3bb86ee935ce58effc5aec514a3e155d/sources/core/qfunctions/oarstat#L310 + # + # Update 2023-07: oarstat now supports multiple types of output, + # once containing `id: XXX` and once containing `Job_Id: XXX` + # + # https://github.com/oar-team/oar/blob/37db5384c7827cca2d334e5248172bb700015434/sources/core/qfunctions/oarstat#L332 job_raw_info = completed.stdout jobid_match = re.search( - r'^Job_Id:\s*(?P\S+)', completed.stdout, re.MULTILINE + r'^(Job_Id|id):\s*(?P\S+)', completed.stdout, re.MULTILINE ) if jobid_match: jobid = jobid_match.group('jobid')