From 59b0b90bf709f41e5e2d4b2b980ce310ae64be2c Mon Sep 17 00:00:00 2001 From: Dan Mick Date: Tue, 28 Jun 2016 20:08:23 -0700 Subject: [PATCH] Use 'conf' instead of 'fn' for the processed arg YamlConfig Signed-off-by: Dan Mick --- teuthology/suite/__init__.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/teuthology/suite/__init__.py b/teuthology/suite/__init__.py index cf0bd631bb..9bd0a09737 100644 --- a/teuthology/suite/__init__.py +++ b/teuthology/suite/__init__.py @@ -45,28 +45,28 @@ def process_args(args): def main(args): - fn = process_args(args) - if fn.verbose: + conf = process_args(args) + if conf.verbose: teuthology.log.setLevel(logging.DEBUG) - if not fn.machine_type or fn.machine_type == 'None': + if not conf.machine_type or conf.machine_type == 'None': schedule_fail("Must specify a machine_type") - elif 'multi' in fn.machine_type: + elif 'multi' in conf.machine_type: schedule_fail("'multi' is not a valid machine_type. " + "Maybe you want 'plana,mira,burnupi' or similar") - if fn.email: - config.results_email = fn.email - if fn.archive_upload: - config.archive_upload = fn.archive_upload - log.info('Will upload archives to ' + fn.archive_upload) + if conf.email: + config.results_email = conf.email + if conf.archive_upload: + config.archive_upload = conf.archive_upload + log.info('Will upload archives to ' + conf.archive_upload) - run = Run(fn) + run = Run(conf) name = run.name run.prepare_and_schedule() - if not fn.dry_run and args['--wait']: + if not conf.dry_run and conf.wait: return wait(name, config.max_job_time, - fn.archive_upload_url) + conf.archive_upload_url) class WaitException(Exception): -- 2.39.5