[buildbot] phase1: perform kmodupload only when needed

LEDE Commits lede-commits at lists.infradead.org
Tue May 16 08:55:58 PDT 2023


ynezz pushed a commit to buildbot.git, annotated tag v3:
https://git.openwrt.org/1da8a2c92e05c038b00eb268f8679b407305a72b

commit 1da8a2c92e05c038b00eb268f8679b407305a72b
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Tue May 16 10:13:11 2023 +0200

    phase1: perform kmodupload only when needed
    
    Fixes: 909e899
    
    Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
    Signed-off-by: Petr Štetiar <ynezz at true.cz>
---
 phase1/master.cfg | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/phase1/master.cfg b/phase1/master.cfg
index c18ee74..f004e36 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -506,6 +506,10 @@ def IsKmodArchiveEnabled(step):
 	branch = step.getProperty("branch")
 	return branch and branches[branch].get("kmod_archive")
 
+def IsKmodArchiveAndRsyncEnabled(step):
+	branch = step.getProperty("branch")
+	return bool(IsKmodArchiveEnabled(step) and branches[branch].get("bin_url"))
+
 def GetBaseVersion(branch):
 	if re.match(r"^[^-]+-[0-9]+\.[0-9]+$", branch):
 		return branch.split('-')[1]
@@ -1208,7 +1212,7 @@ for target in targets:
 		haltOnFailure = True,
 		logEnviron = False,
 		locks = NetLockUl,
-		doStepIf = util.Transform(lambda a, b: bool(a and b), IsKmodArchiveEnabled, GetRsyncParams.withArgs("bin", "url")),
+		doStepIf = IsKmodArchiveAndRsyncEnabled,
 	))
 
 	factory.addStep(ShellCommand(




More information about the lede-commits mailing list