[buildbot] phase2: remove unused tree_expire option and steps

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


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

commit 5c994fce26062710099704ee5c8cd3fe69da261e
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Wed Nov 15 13:44:42 2023 +0100

    phase2: remove unused tree_expire option and steps
    
    Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
 phase2/master.cfg | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/phase2/master.cfg b/phase2/master.cfg
index c0562fc..a499f72 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -62,7 +62,6 @@ c = BuildmasterConfig = {}
 
 worker_port = 9990
 persistent = False
-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", "expire"):
-	tree_expire = ini.getint("phase2", "expire")
-
 if ini.has_option("general", "git_ssh"):
 	git_ssh = ini.getboolean("general", "git_ssh")
 
@@ -470,21 +466,6 @@ for arch in arches:
 			haltOnFailure = True,
 			timeout = 2400))
 
-	# expire tree if needed
-	elif tree_expire > 0:
-		factory.addStep(FileDownload(
-			mastersrc = scripts_dir + '/expire.sh',
-			workerdest = "../expire.sh",
-			mode = 0o755))
-
-		factory.addStep(ShellCommand(
-			name = "expire",
-			description = "Checking for build tree expiry",
-			command = ["./expire.sh", str(tree_expire)],
-			workdir = ".",
-			haltOnFailure = True,
-			timeout = 2400))
-
 	factory.addStep(ShellCommand(
 		name = "mksdkdir",
 		description = "Preparing SDK directory",




More information about the lede-commits mailing list