From patchwork Wed Sep 7 09:20:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thibaut_VAR=C3=88NE?= X-Patchwork-Id: 1675201 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=R70W0JZk; dkim=fail reason="signature verification failed" (1024-bit key; secure) header.d=slashdirt.org header.i=@slashdirt.org header.a=rsa-sha256 header.s=mail header.b=GduFdquA; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMxlF4bWLz1yhd for ; Wed, 7 Sep 2022 19:28:41 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=lRiJFtS8BwThuoFSbIirAH67MKtsLGXUdSyKM7N4wrk=; b=R70W0JZkzVH6rk Wzig/hH7Rv2fXW7yQB3yUSXPql5NVNkkrHUbQKBCWDAALXezrUcQOt8C87oqY2J06GsjYPawqFked PwdZurOOIBwic3PWLJt1yaVbOfkmh076VvyRwRg1mnNSeZMnqWj3Hn22TlKPUlqZ4pNoiMoLnzR7k LHBMhyRB/J5NST0t3Opy9QRlGDZFSm8Ue6D2vtUX9QnXsmuq36mbs9y2GwxtKBb2Ofu3RFQWT9Rsl yzn//tJ+QBZeljo8g/6k2HQwRhZfoXJaZ+nlVQo5CZ43iYJ4R10/V9Io1IDswBo6RCLPypW3HMV6t HNykHFAEGVr8JSf0Gm9Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVrK8-004rGy-6H; Wed, 07 Sep 2022 09:26:20 +0000 Received: from vps.slashdirt.org ([144.91.108.218]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVrF1-004nt1-JU for openwrt-devel@lists.openwrt.org; Wed, 07 Sep 2022 09:21:07 +0000 Received: from supercopter.milliways.lan (milliways.herebedragons.eu [45.13.105.118]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by vps.slashdirt.org (Postfix) with ESMTPSA id B823E63BBC; Wed, 7 Sep 2022 11:20:54 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 vps.slashdirt.org B823E63BBC DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=slashdirt.org; s=mail; t=1662542454; bh=iCT51IML0+8PdYigedr35BucsFzhpG3GWh5Q8C7yd/4=; h=From:To:Cc:Subject:Date:From; b=GduFdquApwtB3p8kZvXwfm6VuG/Y+3tbCNLxP2NpA+f2vkJ93xjeSCbRoVIe1ORsJ 5yYGQsG6pc95xAqbfrjo3P8Hkzkh7IctPKN1Y1MOnZxoXfp2CsD2bGsci03v/dLOLs lM6K8v+LOx5MC+dgOpwFkFIemaWTiigVOcf1vVk0= From: =?utf-8?q?Thibaut_VAR=C3=88NE?= To: openwrt-devel@lists.openwrt.org Cc: =?utf-8?q?Thibaut_VAR=C3=88NE?= Subject: [PATCH] Revert "phase1: remove renderable locks: not supported in 0.8.9" Date: Wed, 7 Sep 2022 11:20:30 +0200 Message-Id: <20220907092031.4749-1-hacks@slashdirt.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220907_022104_179561_88B64F84 X-CRM114-Status: GOOD ( 11.38 ) X-Spam-Score: 0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: This commit re-enables the network locks that were first introduced in in 0edb49341 ("phase1: provide upload/download locking"), but which were disabled in 1e1a32607 as they weren't supported by the b [...] Content analysis details: (0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.4 NO_DNS_FOR_FROM RBL: Envelope sender has no MX or A DNS records [listed in slashdirt.org. IN A] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This commit re-enables the network locks that were first introduced in in 0edb49341 ("phase1: provide upload/download locking"), but which were disabled in 1e1a32607 as they weren't supported by the buildbot version used at the time. The use and benefits of this system is described in 0edb49341. This reverts commit 1e1a326074018542c4a6f14ffe12984fa9c8a192. Signed-off-by: Thibaut VARÈNE --- phase1/master.cfg | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index be3a894..afd79f3 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -821,6 +821,7 @@ for target in targets: branch = repo_branch, mode = 'full', method = 'clean', + locks = NetLockDl, haltOnFailure = True, doStepIf = IsGitCleanRequested, )) @@ -831,6 +832,7 @@ for target in targets: branch = repo_branch, mode = 'full', method = 'fresh', + locks = NetLockDl, haltOnFailure = True, doStepIf = IsGitFreshRequested, )) @@ -913,7 +915,8 @@ for target in targets: description = "Updating feeds", command=["./scripts/feeds", "update"], env = MakeEnv(tryccache=True, overrides={'GIT_SSH_COMMAND': Interpolate("ssh -o IdentitiesOnly=yes -o IdentityFile=%(kw:cwd)s/git-clone.key -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no", cwd=GetCwd)} if git_ssh else {}), - haltOnFailure = True + haltOnFailure = True, + locks = NetLockDl, )) # Git SSH @@ -1029,7 +1032,7 @@ for target in targets: command = ["make", Interpolate("-j%(kw:jobs)s", jobs=GetNumJobs), "download", "V=s"], env = MakeEnv(), logEnviron = False, - locks = [dlLock.access('exclusive')], + locks = properties.FlattenList(NetLockDl, [dlLock.access('exclusive')]), )) factory.addStep(ShellCommand( @@ -1267,6 +1270,7 @@ for target in targets: env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = True, logEnviron = False, + locks = NetLockUl, )) # download remote sha256sums to 'target-sha256sums' @@ -1325,6 +1329,7 @@ for target in targets: env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = True, logEnviron = False, + locks = NetLockUl, )) if enable_kmod_archive: @@ -1337,6 +1342,7 @@ for target in targets: env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = True, logEnviron = False, + locks = NetLockUl, )) if rsync_src_url is not None: @@ -1355,6 +1361,7 @@ for target in targets: env={'RSYNC_PASSWORD': rsync_src_key}, haltOnFailure = True, logEnviron = False, + locks = NetLockUl, )) if False: @@ -1367,6 +1374,7 @@ for target in targets: flunkOnFailure = False, warnOnFailure = True, logEnviron = False, + locks = NetLockUl, )) # logs @@ -1381,6 +1389,7 @@ for target in targets: warnOnFailure = True, alwaysRun = True, logEnviron = False, + locks = NetLockUl, )) factory.addStep(ShellCommand(