From 972ab1cf22000610e93cac5fd5e84a992f8b2116 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Fri, 4 Oct 2013 14:04:43 -0500 Subject: [PATCH] Tweak logic of try_push_job_info() Signed-off-by: Zack Cerza --- teuthology/report.py | 14 ++++++++++---- teuthology/run.py | 1 - 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/teuthology/report.py b/teuthology/report.py index b896ff10c..5e02a3a47 100755 --- a/teuthology/report.py +++ b/teuthology/report.py @@ -335,14 +335,14 @@ def push_job_info(run_name, job_id, job_info, base_uri=None): reporter.report_job(run_name, job_id, job_json) -def try_push_job_info(job_config, job_info=None): +def try_push_job_info(job_config, extra_info=None): """ Wrap push_job_info, gracefully doing nothing if: A RequestFailedError is raised config.results_server is not set - :param job_config: The ctx.config object - :param job_info: Dict to push (commonly None) + :param job_config: The ctx.config object to push + :param extra_info: Optional second dict to push """ if not config.results_server: msg = "No results_server set in {yaml}; not attempting to push results" @@ -350,10 +350,16 @@ def try_push_job_info(job_config, job_info=None): else: run_name = job_config['name'] job_id = job_config['job_id'] - if job_info is None: + + if extra_info is not None: + job_info = extra_info.copy() + job_info.update(job_config) + else: job_info = job_config try: + log.info("Pushing job info to %s", config.results_server) + create_run(run_name) push_job_info(run_name, job_id, job_info) except RequestFailedError: log.exception("Could not report results to %s" % diff --git a/teuthology/run.py b/teuthology/run.py index 20f58ad9e..767d4b6cc 100644 --- a/teuthology/run.py +++ b/teuthology/run.py @@ -263,7 +263,6 @@ def main(): email_results(subject,"Teuthology",ctx.config['email-on-error'],emsg) report.try_push_job_info(ctx.config, ctx.summary) - report.try_push_job_info(ctx.config) if ctx.summary.get('success', True): log.info('pass') -- 2.47.3