X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=phase2%2Fmaster.cfg;h=4154c1d08b61d35acc9076fa99eb2d8c73e15a0c;hb=c89bca2e79c62a8996be44427a31f9081aeb4c4e;hp=ef7b81778b85572b3675a5a274c156f7348aa811;hpb=b71f4a13b2986dff0a6ed551ea4123e99a58df4a;p=buildbot.git

diff --git a/phase2/master.cfg b/phase2/master.cfg
index ef7b817..4154c1d 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -170,7 +170,7 @@ for arch in arches:
 	factory.addStep(ShellCommand(
 		name = "downloadsdk",
 		description = "Downloading SDK archive",
-		command = ["rsync", "-va", "downloads.lede-project.org::downloads/snapshots/targets/%s/%s/[Ll][Ee][Dd][Ee]-[Ss][Dd][Kk]-*.tar.bz2" %(ts[0], ts[1]), "sdk.tar.bz2"],
+		command = ["rsync", "-va", "downloads.lede-project.org::downloads/snapshots/targets/%s/%s/lede-sdk-*.tar.bz2" %(ts[0], ts[1]), "sdk.tar.bz2"],
 		haltOnFailure = True))
 
 	factory.addStep(ShellCommand(
@@ -225,7 +225,7 @@ for arch in arches:
 		name = "packageupload",
 		description = "Uploading package files",
 		workdir = "build/sdk",
-		command = ["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/packages/%s/" %(arch[0]), "%s/packages/%s/" %(rsync_bin_url, arch[0])],
+		command = ["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "bin/packages/%s/" %(arch[0]), "%s/packages/%s/" %(rsync_bin_url, arch[0])],
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = True,
 		logEnviron = False
@@ -261,7 +261,7 @@ for arch in arches:
 		name = "logupload",
 		description = "Uploading failure logs",
 		workdir = "build/sdk",
-		command = ["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "faillogs/", "%s/faillogs/%s/" %(rsync_bin_url, arch[0])],
+		command = ["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "faillogs/", "%s/faillogs/%s/" %(rsync_bin_url, arch[0])],
 		env={'RSYNC_PASSWORD': rsync_bin_key},
 		haltOnFailure = False,
 		logEnviron = False
@@ -272,7 +272,7 @@ for arch in arches:
 			name = "sourceupload",
 			description = "Uploading source archives",
 			workdir = "build/sdk",
-			command = ["rsync", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "dl/", "%s/" %(rsync_src_url)],
+			command = ["rsync", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = False,
 			logEnviron = False
@@ -300,7 +300,7 @@ if ini.has_option("status", "bind"):
 			# change any of these to True to enable; see the manual for more
 			# options
 			auth=auth.BasicAuth([(ini.get("status", "user"), ini.get("status", "password"))]),
-			gracefulShutdown = False,
+			gracefulShutdown = 'auth',
 			forceBuild = 'auth', # use this to test your slave once it is set up
 			forceAllBuilds = 'auth',
 			pingBuilder = False,