[buildbot] phase1: workers are running a single build
LEDE Commits
lede-commits at lists.infradead.org
Mon May 15 08:39:38 PDT 2023
ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/baff1e6fc13de9b045d4f0b0bf7c6c84e9fedafb
commit baff1e6fc13de9b045d4f0b0bf7c6c84e9fedafb
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Wed Oct 26 21:34:19 2022 +0200
phase1: workers are running a single build
Worker lock on dl/ is now unnecessary
Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
phase1/master.cfg | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/phase1/master.cfg b/phase1/master.cfg
index 95a6fee..4bd2f0d 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -503,14 +503,12 @@ def MakeEnv(overrides=None, tryccache=False):
@properties.renderer
def NetLockDl(props, extralock=None):
lock = None
- locks = []
if props.hasProperty("dl_lock"):
lock = NetLocks[props["dl_lock"]]
if lock is not None:
- locks.append(lock.access('exclusive'))
- if extralock is not None:
- locks.append(extralock)
- return locks
+ return [lock.access('exclusive')]
+ else:
+ return []
@properties.renderer
def NetLockUl(props):
@@ -547,8 +545,6 @@ def UsignSec2Pub(props):
c['builders'] = []
-dlLock = locks.WorkerLock("worker_dl")
-
workerNames = [ ]
for worker in c['workers']:
@@ -802,7 +798,7 @@ for target in targets:
command = ["make", Interpolate("-j%(prop:nproc:-1)s"), "download", "V=s"],
env = MakeEnv(),
logEnviron = False,
- locks = NetLockDl.withArgs(dlLock.access('exclusive')),
+ locks = NetLockDl,
))
factory.addStep(ShellCommand(
More information about the lede-commits
mailing list