From 2e3bd45adf56cd46fb87a6dc361411d85ca98f91 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Tue, 14 Jun 2016 15:20:42 +0200 Subject: [PATCH] Revert "Use slave instead of buildername for partial dir to avoid slashes" This reverts commit b71f4a13b2986dff0a6ed551ea4123e99a58df4a. --- phase1/master.cfg | 8 ++++---- phase2/master.cfg | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/phase1/master.cfg b/phase1/master.cfg index edc3f28..e7d3485 100644 --- a/phase1/master.cfg +++ b/phase1/master.cfg @@ -438,7 +438,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "targetupload", description = "Uploading target files", - command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/targets/%s/%s/" %(ts[0], ts[1]), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])], + command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "bin/targets/%s/%s/" %(ts[0], ts[1]), "%s/targets/%s/%s/" %(rsync_bin_url, ts[0], ts[1])], env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = True, logEnviron = False @@ -448,7 +448,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "sourceupload", description = "Uploading source archives", - command=["rsync", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "dl/", "%s/" %(rsync_src_url)], + command=["rsync", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "dl/", "%s/" %(rsync_src_url)], env={'RSYNC_PASSWORD': rsync_src_key}, haltOnFailure = True, logEnviron = False @@ -458,7 +458,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "packageupload", description = "Uploading package files", - command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)], + command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "bin/packages/", "%s/packages/" %(rsync_bin_url)], env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = False, logEnviron = False @@ -469,7 +469,7 @@ EOT''' %(ts[0], ts[0], ts[1]) )) factory.addStep(ShellCommand( name = "upload", description = "Uploading logs", - command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(slavename)s"), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])], + command=["rsync", "--delete", "--delay-updates", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "logs/", "%s/logs/%s/%s/" %(rsync_bin_url, ts[0], ts[1])], env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = False, alwaysRun = True, diff --git a/phase2/master.cfg b/phase2/master.cfg index ef7b817..faba9c9 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -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", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-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", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-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", WithProperties("--partial-dir=.~tmp~%(buildername)s"), "-avz", "dl/", "%s/" %(rsync_src_url)], env={'RSYNC_PASSWORD': rsync_src_key}, haltOnFailure = False, logEnviron = False -- 2.30.2