From: Thibaut VARÈNE <hacks@slashdirt.org>
Date: Thu, 20 Oct 2022 13:51:38 +0000 (+0200)
Subject: phase1: remove 'cleanup' worker option (always set)
X-Git-Tag: v2~47
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5ab238fbcac046bcc93f5f7675438aaf17f8d324;p=buildbot.git

phase1: remove 'cleanup' worker option (always set)

Signed-off-by: Thibaut VARÈNE <hacks@slashdirt.org>
---

diff --git a/phase1/config.ini.example b/phase1/config.ini.example
index a006b56..d65c823 100644
--- a/phase1/config.ini.example
+++ b/phase1/config.ini.example
@@ -57,4 +57,3 @@ password = example
 phase = 1
 name = example-worker-2
 password = example2
-cleanup = 1
diff --git a/phase1/master.cfg b/phase1/master.cfg
index f6e752f..09d3cd4 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -90,11 +90,9 @@ for section in ini.sections():
 	if section.startswith("worker "):
 		if ini.has_option(section, "name") and ini.has_option(section, "password") and \
 		   (not ini.has_option(section, "phase") or ini.getint(section, "phase") == 1):
-			sl_props = { 'dl_lock':None, 'ul_lock':None, 'do_cleanup':False }
+			sl_props = { 'dl_lock':None, 'ul_lock':None }
 			name = ini.get(section, "name")
 			password = ini.get(section, "password")
-			if ini.has_option(section, "cleanup"):
-				sl_props['do_cleanup'] = ini.getboolean(section, "cleanup")
 			if ini.has_option(section, "dl_lock"):
 				lockname = ini.get(section, "dl_lock")
 				sl_props['dl_lock'] = lockname
@@ -561,7 +559,7 @@ for target in targets:
 		repourl = repo_url,
 		branch = repo_branch,
 		mode = 'full',
-		method = Interpolate("%(prop:do_cleanup:#?|fresh|clean)s"),
+		method = 'fresh',
 		locks = NetLockDl,
 		haltOnFailure = True,
 	))