From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gnu.wildebeest.org (gnu.wildebeest.org [45.83.234.184]) by sourceware.org (Postfix) with ESMTPS id 31AF138582BA for ; Sun, 9 Oct 2022 12:53:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 31AF138582BA Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=klomp.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=klomp.org Received: from reform (deer0x0d.wildebeest.org [172.31.17.143]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by gnu.wildebeest.org (Postfix) with ESMTPSA id 7D893300026A for ; Sun, 9 Oct 2022 14:53:37 +0200 (CEST) Received: by reform (Postfix, from userid 1000) id 0C83F2E82089; Sun, 9 Oct 2022 14:53:37 +0200 (CEST) Date: Sun, 9 Oct 2022 14:53:36 +0200 From: Mark Wielaard To: buildbot@sourceware.org Subject: Re: [PATCH] Upgrade to buildbot 3.6.1 Message-ID: References: <20221008231256.13072-1-mark@klomp.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20221008231256.13072-1-mark@klomp.org> X-Spam-Status: No, score=-3039.1 required=5.0 tests=BAYES_00,GIT_PATCH_0,JMQ_SPF_NEUTRAL,KAM_DMARC_STATUS,KAM_NUMSUBJECT,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: 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 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