Re: [PATCH] Upgrade to buildbot 3.6.1

[Mark Wielaard <mark@klomp.org>]

Hi,

On Sun, Oct 09, 2022 at 01:12:56AM +0200, Mark Wielaard wrote:
> This includes our patch for:
> - Fixed issue with DockerLatentWorker accumulating connections with
>   the docker server (issue #6538).
> 
> It will hopefully also fix our git upgrade failure issue:
> - Fixed “retry fetch” and “clobber on failure” git checkout options.
> 
> Include upgrade instructions in README.

The upgrade seems to work well, but I did have to revert one upstream
commit to get email reporters to work again:

commit ab24f39532067b8fbe0f980caab19956c2be54f0
Author: Oleksii Odynochenko <oleksii.odynochenko@gmail.com>
Date:   Wed Jul 27 12:17:00 2022 +0300

    reporters: fix email sending with Twisted 21.2.0+
    
    Seems that hostname argument to ESMTPSenderFactory is mandatory.

diff --git a/master/buildbot/reporters/mail.py b/master/buildbot/reporters/mail.py
index 4fa020808..bc2979d22 100644
--- a/master/buildbot/reporters/mail.py
+++ b/master/buildbot/reporters/mail.py
@@ -336,7 +336,7 @@ class MailNotifier(ReporterBase):
             unicode2bytes(self.smtpUser), unicode2bytes(self.smtpPassword),
             parseaddr(self.fromaddr)[1], recipients, BytesIO(s),
             result, requireTransportSecurity=self.useTls,
-            requireAuthentication=useAuth)
+            requireAuthentication=useAuth, hostname=self.relayhost)
 
         if self.useSmtps:
             reactor.connectSSL(self.relayhost, self.smtpPort,

This seems to be this upstream issue:
https://github.com/buildbot/buildbot/issues/5943

Cheers,

Mark