[buildbot] phase2: remove unused 'other_builds' property

LEDE Commits lede-commits at lists.infradead.org
Thu Nov 16 03:48:32 PST 2023


ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/907d71ef6c479831c8086c0b9f83d1c3d38ab6ef

commit 907d71ef6c479831c8086c0b9f83d1c3d38ab6ef
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Sat Nov 11 16:11:25 2023 +0100

    phase2: remove unused 'other_builds' property
    
    Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
 phase2/master.cfg | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/phase2/master.cfg b/phase2/master.cfg
index e19a731..5e8b71c 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -61,7 +61,6 @@ c = BuildmasterConfig = {}
 
 worker_port = 9990
 persistent = False
-other_builds = 0
 tree_expire = 0
 git_ssh = False
 git_ssh_key = None
@@ -72,9 +71,6 @@ if ini.has_option("phase2", "port"):
 if ini.has_option("phase2", "persistent"):
 	persistent = ini.getboolean("phase2", "persistent")
 
-if ini.has_option("phase2", "other_builds"):
-	other_builds = ini.getint("phase2", "other_builds")
-
 if ini.has_option("phase2", "expire"):
 	tree_expire = ini.getint("phase2", "expire")
 
@@ -293,7 +289,7 @@ def GetDirectorySuffix(props):
 
 def GetNumJobs(props):
 	if props.hasProperty("workername") and props.hasProperty("nproc"):
-		return ((int(props["nproc"]) / (max_builds[props["workername"]] + other_builds)) + 1)
+		return ((int(props["nproc"]) / max_builds[props["workername"]]) + 1)
 	else:
 		return 1
 




More information about the lede-commits mailing list