[buildbot] phase1: remove unused 'other_builds'

LEDE Commits lede-commits at lists.infradead.org
Mon May 15 08:38:48 PDT 2023


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

commit 02f282740725c5b298fa907beccd7cfb81be9a1f
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Wed Oct 19 16:19:42 2022 +0200

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

diff --git a/phase1/master.cfg b/phase1/master.cfg
index afd79f3..be3c3fa 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -214,7 +214,6 @@ c['prioritizeBuilders'] = prioritizeBuilders
 work_dir = os.path.abspath(ini.get("general", "workdir") or ".")
 scripts_dir = os.path.abspath("../scripts")
 tree_expire = 0
-other_builds = 0
 cc_version = None
 
 cc_command = "gcc"
@@ -228,9 +227,6 @@ git_ssh_key = None
 if ini.has_option("phase1", "expire"):
 	tree_expire = ini.getint("phase1", "expire")
 
-if ini.has_option("phase1", "other_builds"):
-	other_builds = ini.getint("phase1", "other_builds")
-
 if ini.has_option("phase1", "cc_version"):
 	cc_version = ini.get("phase1", "cc_version").split()
 	if len(cc_version) == 1:
@@ -504,7 +500,7 @@ def GetVersionPrefix(props):
 @properties.renderer
 def GetNumJobs(props):
 	if props.hasProperty("max_builds") and props.hasProperty("nproc"):
-		return str(int(int(props["nproc"]) / (props["max_builds"] + other_builds)))
+		return str(int(int(props["nproc"]) / props["max_builds"]))
 	else:
 		return "1"
 




More information about the lede-commits mailing list