From 194095f0ae182b87bb3c794db474014d1abf4dec Mon Sep 17 00:00:00 2001 From: matt-duell Date: Sat, 4 Feb 2017 16:25:49 -0500 Subject: [PATCH 1/4] For Issue #413 - general idea on configuring the mail notifier for failed builds. Still requires proper emails --- buildbot/master/files/config/master.cfg | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg index 9b288328..0dfb39dd 100644 --- a/buildbot/master/files/config/master.cfg +++ b/buildbot/master/files/config/master.cfg @@ -1,5 +1,6 @@ from buildbot.plugins import buildslave, changes, schedulers, status, util from buildbot.status import html, status_push, web, words +from buildbot.status.mail import MailNotifier import environments as envs import factories @@ -13,7 +14,6 @@ MAC_SLAVES = ["servo-mac2", "servo-mac3", "servo-mac4", "servo-macpro1"] CROSS_SLAVES = ["servo-linux-cross{}".format(i) for i in range(1, 3)] WINDOWS_SLAVES = ["servo-windows{}".format(i) for i in range(1, 3)] - c = BuildmasterConfig = {} c['protocols'] = {'pb': {'port': 9001}} c['caches'] = { @@ -231,9 +231,25 @@ c['status'] = [ 'failure': 1, }, ), + MailNotifier( + fromaddr="buildbot@example.org", + sendToInterestedUsers=False, + extraRecipients=["listaddr@example.org"], + builders=[ + "android-nightly", + "linux-nightly", + "linux-rel-intermittent", + "mac-nightly", + "mac-rel-intermittent", + "windows-gnu-nightly", + "windows-msvc-nightly" + ] + + ) + + ] - ################## # PROJECT IDENTITY ################## From 05e0a475908d9e1357e196f94b4804681f56b6e3 Mon Sep 17 00:00:00 2001 From: matt-duell Date: Mon, 6 Feb 2017 16:32:45 -0500 Subject: [PATCH 2/4] Removing lines containing whitespace failing build. --- buildbot/master/files/config/master.cfg | 2 -- 1 file changed, 2 deletions(-) diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg index 0dfb39dd..4d77e7c9 100644 --- a/buildbot/master/files/config/master.cfg +++ b/buildbot/master/files/config/master.cfg @@ -244,10 +244,8 @@ c['status'] = [ "windows-gnu-nightly", "windows-msvc-nightly" ] - ) - ] ################## From 0b6d4a1a3008b41be8c411d6e2a081c58b55b578 Mon Sep 17 00:00:00 2001 From: matt-duell Date: Tue, 7 Feb 2017 22:27:28 -0500 Subject: [PATCH 3/4] Implemented feedback from PR. centralized nightly builders list. --- buildbot/master/files/config/master.cfg | 36 ++++++++++++------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg index 4d77e7c9..f0961168 100644 --- a/buildbot/master/files/config/master.cfg +++ b/buildbot/master/files/config/master.cfg @@ -14,6 +14,18 @@ MAC_SLAVES = ["servo-mac2", "servo-mac3", "servo-mac4", "servo-macpro1"] CROSS_SLAVES = ["servo-linux-cross{}".format(i) for i in range(1, 3)] WINDOWS_SLAVES = ["servo-windows{}".format(i) for i in range(1, 3)] + +NIGHTLY_BUILDERS = [ + "android-nightly", + "linux-nightly", + "linux-rel-intermittent", + "mac-nightly", + "mac-rel-intermittent", + "windows-gnu-nightly", + "windows-msvc-nightly", +] + + c = BuildmasterConfig = {} c['protocols'] = {'pb': {'port': 9001}} c['caches'] = { @@ -111,15 +123,7 @@ c['schedulers'].append(schedulers.ForceScheduler( c['schedulers'].append(schedulers.Nightly( name="Nightly", branch="master", - builderNames=[ - "android-nightly", - "linux-nightly", - "linux-rel-intermittent", - "mac-nightly", - "mac-rel-intermittent", - "windows-gnu-nightly", - "windows-msvc-nightly", - ], + builderNames=NIGHTLY_BUILDERS, hour=1, minute=0, )) @@ -234,17 +238,11 @@ c['status'] = [ MailNotifier( fromaddr="buildbot@example.org", sendToInterestedUsers=False, + mode=["failing","exception"], + addPatch=False, extraRecipients=["listaddr@example.org"], - builders=[ - "android-nightly", - "linux-nightly", - "linux-rel-intermittent", - "mac-nightly", - "mac-rel-intermittent", - "windows-gnu-nightly", - "windows-msvc-nightly" - ] - ) + builders=NIGHTLY_BUILDERS, + ), ] From c0ebb06e6b459c01c0cbb8e41b326f9a3694e52c Mon Sep 17 00:00:00 2001 From: matt-duell Date: Wed, 8 Feb 2017 20:41:46 -0500 Subject: [PATCH 4/4] Adding space to mode list --- buildbot/master/files/config/master.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildbot/master/files/config/master.cfg b/buildbot/master/files/config/master.cfg index f0961168..3f71170f 100644 --- a/buildbot/master/files/config/master.cfg +++ b/buildbot/master/files/config/master.cfg @@ -238,7 +238,7 @@ c['status'] = [ MailNotifier( fromaddr="buildbot@example.org", sendToInterestedUsers=False, - mode=["failing","exception"], + mode=["failing", "exception"], addPatch=False, extraRecipients=["listaddr@example.org"], builders=NIGHTLY_BUILDERS,