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",