From 633aad43c6a71c47fa46ef5f0e976a46cceea576 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@sergiodj.net>
Date: Tue, 23 Dec 2014 20:02:31 -0500
Subject: [PATCH] Improving email message; little formatting issues

---
 master.cfg | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/master.cfg b/master.cfg
index 914c711..f85e98a 100644
--- a/master.cfg
+++ b/master.cfg
@@ -108,19 +108,42 @@ c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))
 def MessageGDBTesters (mode, name, build, results, master_status):
     """This function is responsible for composing the message that will be
 send to the gdb-testers mailing list."""
-    ss_list = build.getSourceStamps ()
+    # Subject
     subj = "Failures on %s" % name
+
+    # Body
     text = ""
+
+    # Buildslave name, useful for knowing the exact configuration.
     text += "Builder:\n"
     text += "\t%s\n" % build.getSlavename ()
+
+    # Commits that were tested.  Usually we should be dealing with
+    # only one commit
     text += "Commit(s) tested:\n"
+    ss_list = build.getSourceStamps ()
     for ss in ss_list:
         text += "\t%s\n" % ss.revision
+
+    # URL to find more info about what went wrong.
+    text += "Log URL(s):\n"
+    for ss in ss_list:
+        text += "\t<http://sdj-gdbbuild.usersys.redhat.com/%s/%s>\n" % (name, ss.revision)
+
+    # Who's to blame?
+    text += "Author(s):\n"
+    text += "\t%s\n" % build.getResponsibleUsers()
+
+    # Including the 'regressions' log.  This is the 'diff' of what
+    # went wrong.
     text += "\n"
     for log in build.getLogs ():
         if log.getName () == 'regressions' and log.hasContents ():
             text += log.getText ()
             break
+
+    # Including the 'xfail' log.  It is important to say which tests
+    # we are ignoring.
     xfail = os.path.join (gdb_web_base, name, 'xfail')
     if os.path.exists (xfail):
         text += "\n"
@@ -135,7 +158,7 @@ send to the gdb-testers mailing list."""
 from buildbot.status import mail
 mn = mail.MailNotifier(fromaddr = "sergiodj@redhat.com",
                        sendToInterestedUsers = False,
-                       extraRecipients = ['sergiodj@redhat.com'],
+                       extraRecipients = ['sergiodj@redhat.com', 'jan.kratochvil@redhat.com'],
 #                       extraRecipients = ['gdb-testers@sourceware.org'],
                        relayhost = "smtp.corp.redhat.com",
                        mode = ('failing'),
@@ -294,7 +317,9 @@ BuildBot halt on failure."""
 ## most builds.
 
 class BuildAndTestGDBFactory (factory.BuildFactory):
-    """This is the main build factory for the GDB project.  It was made to be very configurable, and should be enough to describe most builds.  The parameters of the class are:
+    """This is the main build factory for the GDB project.  It was made to
+be very configurable, and should be enough to describe most builds.
+The parameters of the class are:
 
     - ConfigureClass: set this to be the class (i.e., build step) that
       will be called to configure GDB.  It needs to accept the same
@@ -389,8 +414,7 @@ class BuildAndTestGDBFactory (factory.BuildFactory):
                                                                       'builddir'),
                                             description = 'analyze test results'))
         self.addStep (FileUpload (slavesrc = WithProperties ("%s/build/gdb/testsuite/gdb.log", 'builddir'),
-                                  masterdest = WithProperties ("public_html/results/%s/gdb.log", 'buildername'),
-                                  hideStepIf = False))
+                                  masterdest = WithProperties ("public_html/results/%s/gdb.log", 'buildername')))
         self.addStep (SaveGDBResults ())