From: Zack Cerza <zack@cerza.org>
Date: Mon, 4 Nov 2013 20:02:45 +0000 (-0600)
Subject: Transition from sentry_events to sentry_event
X-Git-Tag: 1.1.0~1782^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=3bd490f307b32810c34b8eff5498f4c40a9e8372;p=teuthology.git

Transition from sentry_events to sentry_event
---

diff --git a/teuthology/results.py b/teuthology/results.py
index 7bbbdb5187..a21bd4352b 100644
--- a/teuthology/results.py
+++ b/teuthology/results.py
@@ -142,10 +142,15 @@ def build_email_body(name, archive_dir, timeout):
                 log_line = email_templates['fail_log_templ'].format(log=log)
             else:
                 log_line = ''
+            # Transitioning from sentry_events -> sentry_event
             sentry_events = summary.get('sentry_events')
             if sentry_events:
+                sentry_event = sentry_events[0]
+            else:
+                sentry_event = summary.get('sentry_event', '')
+            if sentry_event:
                 sentry_line = email_templates['fail_sentry_templ'].format(
-                    sentries='\n        '.join(sentry_events))
+                    sentry_event='\n        '.join(sentry_event))
             else:
                 sentry_line = ''
 
@@ -235,7 +240,7 @@ email_templates = {
 
         """),
     'fail_log_templ': "\nlog:    {log}",
-    'fail_sentry_templ': "\nsentry: {sentries}",
+    'fail_sentry_templ': "\nsentry: {sentry_event}",
     'hung_templ': dedent("""\
         [{job_id}] {desc}
         """),
diff --git a/teuthology/run_tasks.py b/teuthology/run_tasks.py
index fd14764082..81011e12f7 100644
--- a/teuthology/run_tasks.py
+++ b/teuthology/run_tasks.py
@@ -67,9 +67,7 @@ def run_tasks(tasks, ctx):
             event_url = "{server}/search?q={id}".format(
                 server=teuth_config.sentry_server.strip('/'), id=exc_id)
             log.exception(" Sentry event: %s" % event_url)
-            sentry_url_list = ctx.summary.get('sentry_events', [])
-            sentry_url_list.append(event_url)
-            ctx.summary['sentry_events'] = sentry_url_list
+            ctx.summary['sentry_event'] = event_url
         if ctx.config.get('interactive-on-error'):
             from .task import interactive
             log.warning('Saw failure, going into interactive mode...')