From: Zack Cerza <zack@cerza.org>
Date: Wed, 11 Sep 2013 20:45:45 +0000 (-0500)
Subject: Add teuthology branch to sentry report tags
X-Git-Tag: 1.1.0~1883^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1228d8cb5a7897b427cd0c76c2b7856edfaf3e48;p=teuthology.git

Add teuthology branch to sentry report tags
---

diff --git a/teuthology/run_tasks.py b/teuthology/run_tasks.py
index 7a532f5f2..fa47541bb 100644
--- a/teuthology/run_tasks.py
+++ b/teuthology/run_tasks.py
@@ -39,19 +39,22 @@ def run_tasks(tasks, ctx):
         log.exception('Saw exception from tasks.')
         sentry = get_sentry_client()
         if sentry:
+            config = deepcopy(ctx.config)
+
             tags = {
                 'task': taskname,
                 'owner': ctx.owner,
             }
-            job_id = getattr(ctx, 'job_id', None)
+            if 'teuthology_branch' in config:
+                tags['teuthology_branch'] = config['teuthology_branch']
 
-            config = deepcopy(ctx.config)
             # Remove ssh keys from reported config
             if 'targets' in config:
                 targets = config['targets']
                 for host in targets.keys():
                     targets[host] = '<redacted>'
 
+            job_id = getattr(ctx, 'job_id', None)
             extra = {
                 'config': config,
                 'logs': get_http_log_path(ctx.archive, job_id),