From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 6 Jun 2018 20:04:01 +0000 (+0200)
Subject: sourceupload: add slave name to rsync temp directory name
X-Git-Tag: v1~160
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=69b93377cc079fddcbf0aa5da7698d1ed884d011;p=buildbot.git

sourceupload: add slave name to rsync temp directory name

This solves clashes when the same target builders on different clusters
upload source archives at the same time.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 94bbfad..af07afb 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -772,7 +772,8 @@ for target in targets:
 		factory.addStep(ShellCommand(
 			name = "sourceupload",
 			description = "Uploading source archives",
-			command=["rsync", "-4", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+			command=["rsync", "-4", "--progress", "--checksum", "--delay-updates",
+			         WithProperties("--partial-dir=.~tmp~%s~%s~%%(slavename)s" %(ts[0], ts[1])), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = True,
 			logEnviron = False
diff --git a/phase2/master.cfg b/phase2/master.cfg
index 76cca4f..150e961 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -456,7 +456,8 @@ for arch in arches:
 			name = "sourceupload",
 			description = "Uploading source archives",
 			workdir = "build/sdk",
-			command = ["rsync", "-4", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+			command = ["rsync", "-4", "--progress", "--checksum", "--delay-updates",
+			           WithProperties("--partial-dir=.~tmp~%s~%%(slavename)s" %(arch[0])), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = False,
 			logEnviron = False