From 8de3d3551ecdf2cb780413774261a6cae6021beb Mon Sep 17 00:00:00 2001
From: =?utf8?q?Thibaut=20VAR=C3=88NE?= <hacks@slashdirt.org>
Date: Tue, 6 Sep 2022 17:19:37 +0200
Subject: [PATCH] Revert "phase1: remove renderable locks: not supported in
 0.8.9"
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 <hacks@slashdirt.org>
---
 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(
-- 
2.30.2