From: Thibaut VARÈNE Date: Sat, 11 Nov 2023 15:11:25 +0000 (+0100) Subject: phase2: remove unused 'other_builds' property X-Git-Tag: v10~14 X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=907d71ef6c479831c8086c0b9f83d1c3d38ab6ef phase2: remove unused 'other_builds' property Signed-off-by: Thibaut VARÈNE --- 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