##// END OF EJS Templates
regexp group in BatchLauncher, no Condor -verbose...
James Booth -
Show More
@@ -1037,6 +1037,8 b' class BatchSystemLauncher(BaseLauncher):'
1037 job_id_regexp = CRegExp('', config=True,
1037 job_id_regexp = CRegExp('', config=True,
1038 help="""A regular expression used to get the job id from the output of the
1038 help="""A regular expression used to get the job id from the output of the
1039 submit_command.""")
1039 submit_command.""")
1040 job_id_regexp_group = Integer(0, config=True,
1041 help="""The group we wish to match in job_id_regexp (0 to match all)""")
1040 batch_template = Unicode('', config=True,
1042 batch_template = Unicode('', config=True,
1041 help="The string that is the batch script template itself.")
1043 help="The string that is the batch script template itself.")
1042 batch_template_file = Unicode(u'', config=True,
1044 batch_template_file = Unicode(u'', config=True,
@@ -1090,7 +1092,7 b' class BatchSystemLauncher(BaseLauncher):'
1090 """Take the output of the submit command and return the job id."""
1092 """Take the output of the submit command and return the job id."""
1091 m = self.job_id_regexp.search(output)
1093 m = self.job_id_regexp.search(output)
1092 if m is not None:
1094 if m is not None:
1093 job_id = m.group()
1095 job_id = m.group(self.job_id_regexp_group)
1094 else:
1096 else:
1095 raise LauncherError("Job id couldn't be determined: %s" % output)
1097 raise LauncherError("Job id couldn't be determined: %s" % output)
1096 self.job_id = job_id
1098 self.job_id = job_id
@@ -1321,12 +1323,14 b' class LSFEngineSetLauncher(LSFLauncher, BatchClusterAppMixin):'
1321 class CondorLauncher(BatchSystemLauncher):
1323 class CondorLauncher(BatchSystemLauncher):
1322 """A BatchSystemLauncher subclass for Condor."""
1324 """A BatchSystemLauncher subclass for Condor."""
1323
1325
1324 submit_command = List(['condor_submit', '-verbose'], config=True,
1326 submit_command = List(['condor_submit'], config=True,
1325 help="The Condor submit command ['condor_submit']")
1327 help="The Condor submit command ['condor_submit']")
1326 delete_command = List(['condor_rm'], config=True,
1328 delete_command = List(['condor_rm'], config=True,
1327 help="The Condor delete command ['condor_rm']")
1329 help="The Condor delete command ['condor_rm']")
1328 job_id_regexp = CRegExp(r'\d+', config=True,
1330 job_id_regexp = CRegExp(r'(\d+)\.$', config=True,
1329 help="Regular expression for identifying the job ID [r'\d+']")
1331 help="Regular expression for identifying the job ID [r'(\d+)\.$']")
1332 job_id_regexp_group = Integer(1, config=True,
1333 help="""The group we wish to match in job_id_regexp [1]""")
1330
1334
1331 job_array_regexp = CRegExp('queue\W+\$')
1335 job_array_regexp = CRegExp('queue\W+\$')
1332 job_array_template = Unicode('queue {n}')
1336 job_array_template = Unicode('queue {n}')
@@ -1377,7 +1381,6 b' executable = %s'
1377 # by default we expect a shared file system
1381 # by default we expect a shared file system
1378 transfer_executable = False
1382 transfer_executable = False
1379 arguments = "--log-to-file '--profile-dir={profile_dir}' '--cluster-id={cluster_id}'"
1383 arguments = "--log-to-file '--profile-dir={profile_dir}' '--cluster-id={cluster_id}'"
1380
1381 """ % condor_ipengine_cmd_argv)
1384 """ % condor_ipengine_cmd_argv)
1382
1385
1383 def start(self, n):
1386 def start(self, n):
General Comments 0
You need to be logged in to leave comments. Login now