From 9abb2a4d3b9aaa33d765c929d97d96d57be713d2 Mon Sep 17 00:00:00 2001 From: Michael Still Date: Fri, 10 Jan 2014 14:13:15 +1100 Subject: [PATCH] Log job identifiers in an attempt to find the queue name bug. We have a bug where log file paths sometimes have the wrong queue name in them. I am hoping that adding some more debugging here will help me find where this bug is occuring. Change-Id: Id75f2e824a1a6c18695ec541752813d9708fd7cf --- turbo_hipster/lib/utils.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/turbo_hipster/lib/utils.py b/turbo_hipster/lib/utils.py index 9f69d1a..424baab 100644 --- a/turbo_hipster/lib/utils.py +++ b/turbo_hipster/lib/utils.py @@ -23,6 +23,9 @@ import swiftclient import time +log = logging.getLogger('lib.utils') + + class GitRepository(object): """ Manage a git repository for our uses """ @@ -239,9 +242,13 @@ def scp_push_file(job_log_dir, file_path, local_config): def determine_job_identifier(zuul_arguments, job, unique): if 'build:' in job: job = job.split('build:')[1] - return os.path.join(zuul_arguments['ZUUL_CHANGE'][:2], + + path = os.path.join(zuul_arguments['ZUUL_CHANGE'][:2], zuul_arguments['ZUUL_CHANGE'], zuul_arguments['ZUUL_PATCHSET'], zuul_arguments['ZUUL_PIPELINE'], job, unique[:7]) + log.info('Converted args: %s, job: %s and unique: %s to %s' + % (zuul_arguments, job, unique, path)) + return path