[PATCH] Upgrade to buildbot 3.6.1

[PATCH] Upgrade to buildbot 3.6.1

[Mark Wielaard]

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.
---
 README                | 12 ++++++++++++
 buildbot.requirements | 12 ++++++------
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 93ab54e..b909026 100644
--- a/README
+++ b/README
@@ -229,6 +229,18 @@ If this seems to not work check whether there are still git
 change-sources being checked and wait till they have done their
 work.
 
+= Upgrading buildbot
+
+Try this locally first.
+
+- python3 -m pip install --upgrade `cat buildbot.packages`
+- python3 -m pip freeze > buildbot.requirements
+
+Try the new setup first as under "Local hacking".
+
+After check in someone with buildbot shell access will have to
+actually stop, upgrade and restart the buildbot on sourceware.
+
 = Reconfig buildbot
 
 When making any changes to master.cfg. Please test everything first in
diff --git a/buildbot.requirements b/buildbot.requirements
index f62ee80..2e294e6 100644
--- a/buildbot.requirements
+++ b/buildbot.requirements
@@ -3,11 +3,11 @@ attrs==21.4.0
 autobahn==21.2.1
 Automat==20.2.0
 bcrypt==3.2.0
-buildbot==3.5.0
-buildbot-badges==3.5.0
-buildbot-console-view==3.5.0
-buildbot-worker==3.5.0
-buildbot-www==3.5.0
+buildbot==3.6.1
+buildbot-badges==3.6.1
+buildbot-console-view==3.6.1
+buildbot-worker==3.6.1
+buildbot-www==3.6.1
 cairocffi==1.2.0
 CairoSVG==2.5.2
 certifi==2021.10.8
@@ -32,7 +32,7 @@ klein==21.8.0
 Mako==1.1.6
 MarkupSafe==2.0.1
 msgpack==1.0.3
-paramiko==2.10.3
+paramiko==2.11.0
 Pillow==8.4.0
 pyasn1==0.4.8
 pyasn1-modules==0.2.8
-- 
2.30.2

Re: [PATCH] Upgrade to buildbot 3.6.1

[Mark Wielaard]

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