From 753c75ee3980e5843d716e9c69cc9aae8cfea952 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 24 Aug 2018 19:40:14 +0800 Subject: [PATCH] suite.run: extract write_result() out of prepare_and_schedule() so it's more modular. Signed-off-by: Kefu Chai --- teuthology/suite/run.py | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py index 8abca0fc6..8de984bdb 100644 --- a/teuthology/suite/run.py +++ b/teuthology/suite/run.py @@ -291,6 +291,26 @@ class Run(object): base_args.extend(['--owner', self.args.owner]) return base_args + def write_result(self): + arg = copy.deepcopy(self.base_args) + arg.append('--last-in-suite') + if self.base_config.email: + arg.extend(['--email', self.base_config.email]) + if self.args.subset: + subset = '/'.join(str(i) for i in self.args.subset) + arg.extend(['--subset', subset]) + arg.extend(['--seed', str(self.args.seed)]) + if self.args.timeout: + arg.extend(['--timeout', self.args.timeout]) + util.teuthology_schedule( + args=arg, + dry_run=self.args.dry_run, + verbose=self.args.verbose, + log_prefix="Results: ") + results_url = get_results_url(self.base_config.name) + if results_url: + log.info("Test results viewable at %s", results_url) + def prepare_and_schedule(self): """ Puts together some "base arguments" with which to execute @@ -309,25 +329,7 @@ class Run(object): num_jobs = self.schedule_suite() if num_jobs: - arg = copy.deepcopy(self.base_args) - arg.append('--last-in-suite') - if self.base_config.email: - arg.extend(['--email', self.base_config.email]) - if self.args.subset: - subset = '/'.join(str(i) for i in self.args.subset) - arg.extend(['--subset', subset]) - arg.extend(['--seed', str(self.args.seed)]) - if self.args.timeout: - arg.extend(['--timeout', self.args.timeout]) - util.teuthology_schedule( - args=arg, - dry_run=self.args.dry_run, - verbose=self.args.verbose, - log_prefix="Results: ", - ) - results_url = get_results_url(self.base_config.name) - if results_url: - log.info("Test results viewable at %s", results_url) + self.write_result() def collect_jobs(self, arch, configs, newest=False): jobs_to_schedule = [] -- 2.47.3