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 94bbfad4c7ebab9af66dc66447b8eeab477e0d44..af07afbfd268bcef70a1eba0e26e10a292afc315 100644 (file)
--- 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 76cca4f5f8775892d79dc412d85ac00c17636cb9..150e96134a78360553cd5a233d057d5a57d1d574 100644 (file)
--- 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