try update buildmaster configuration for #6571

1 files changed, 19 insertions, 12 deletions

diff --git a/buildbot/master.cfg b/buildbot/master.cfg
index 56fa75f..c5e7b89 100644
--- a/buildbot/master.cfg
+++ b/buildbot/master.cfg
@@ -161,9 +161,9 @@ LINKCHECKER_SCHEDULER = schedulers.Nightly(
 # buildslavetest SCHEDULER
 BUILDSLAVETEST_SCHEDULER = schedulers.SingleBranchScheduler(
 #    properties = {
-#        'owner': ['buckE@taler.net',]
+#        'owner': ['grothoff@taler.net',]
 #    },
-#owners=['buckE@taler.net',]
+#owners=['grothoff@taler.net',]
     name="buildslavetest-scheduler",
     builderNames=["buildslavetest-builder"],
     change_filter=util.ChangeFilter(
@@ -1096,11 +1096,22 @@ IRC = reporters.IRC(
     }
 )
 
+mail_generator = reporters.BuildStatusGenerator(
+    mode=('change','problem','failing','exception',),
+    message_formatter=reporters.MessageFormatter(
+       template_type='plain',
+       wantSteps=True,
+       wantLogs=True
+     ),
+#    add_logs=True
+    )
+
 EMAIL = reporters.MailNotifier(
     fromaddr="testbuild@taler.net",
     sendToInterestedUsers=False,
     # notify from pass to fail, and viceversa.
-    mode=("change"),
+#    mode=("change"),
+    generators=[mail_generator],
     builders=(
         "lcov-builder",
         "checker-builder",
@@ -1111,8 +1122,7 @@ EMAIL = reporters.MailNotifier(
         # Rarely/never used, excluding.
         # "selenium-builder"
     ),
-    extraRecipients=["buildfailures@taler.net"],
-    subject="Taler build."
+    extraRecipients=["buildfailures@taler.net"]
 )
 
 buildslavetestNotifier = reporters.MailNotifier(
@@ -1123,8 +1133,7 @@ buildslavetestNotifier = reporters.MailNotifier(
     # notify if sphinx exits with error (command line option in Makefile turns warnings into exit 1)
     mode=('all'),
     builders=('buildslavetest-builder',),
-    extraRecipients=['buckE@taler.net'],
-    subject="BB: buildslavetest."
+    extraRecipients=['grothoff@taler.net']
 )
 
 brokenLinksEmailNotifier = reporters.MailNotifier(
@@ -1135,8 +1144,7 @@ brokenLinksEmailNotifier = reporters.MailNotifier(
     # notify if build fails (ex: linkchecker.sh exit 1)
     mode=('failing'),
     builders=('linkchecker-builder',),
-    extraRecipients=['linkcheck@taler.net'],
-    subject="BB: Broken Links Found in www.taler.net.  Log attached."
+    extraRecipients=['linkcheck@taler.net']
 )
 
 #sphinxErrorNotifier = reporters.MailNotifier(
@@ -1147,8 +1155,7 @@ brokenLinksEmailNotifier = reporters.MailNotifier(
 #    # notify if sphinx exits with error (command line option in Makefile turns warnings into exit 1)
 #    mode=('failing'),
 #    builders=('doc-builder',),
-#    extraRecipients=['sphinxerrors@taler.net'],
-#    subject="BB: doc-builder (sphinx) has warnings or errors.  Log attached."
+#    extraRecipients=['sphinxerrors@taler.net']
 #)
 
 c["services"] = [
@@ -1219,7 +1226,7 @@ authz = util.Authz(
     roleMatchers=[
         util.RolesFromUsername(
             roles=["admins"],
-            usernames=["marcello", "florian", "christian", "buckE"]
+            usernames=["marcello", "florian", "christian"]
         )
     ]
 )