Also leave a list of sentry events in the summary

diff --git a/teuthology/run_tasks.py b/teuthology/run_tasks.py
index 3f7d7821afc89bbeb5247668beb957fe4b00449a..e3a336d8aed518632326cda582a6a5e5fb42c877 100644 (file)
--- a/teuthology/run_tasks.py
+++ b/teuthology/run_tasks.py
@@ -1,10 +1,11 @@
 import sys
 import logging
 from teuthology.sentry import get_client as get_sentry_client
-from .config import config
+from .config import config as teuth_config
 
 log = logging.getLogger(__name__)
 
+
 def run_one_task(taskname, **kwargs):
     submod = taskname
     subtask = 'task'
@@ -15,6 +16,7 @@ def run_one_task(taskname, **kwargs):
     fn = getattr(mod, subtask)
     return fn(**kwargs)
 
+
 def run_tasks(tasks, ctx):
     stack = []
     try:
@@ -35,10 +37,13 @@ def run_tasks(tasks, ctx):
         log.exception('Saw exception from tasks.')
         sentry = get_sentry_client()
         if sentry:
-            exc_id = sentry.captureException()
-            log.exception(" Sentry event: {server}/search?q={id}".format(
-                server=config.sentry_server,
-                id=exc_id))
+            exc_id = sentry.get_ident(sentry.captureException())
+            event_url = "{server}/search?q={id}".format(
+                server=teuth_config.sentry_server, 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
         if ctx.config.get('interactive-on-error'):
             from .task import interactive
             log.warning('Saw failure, going into interactive mode...')