From: Jo-Philipp Wich Date: Tue, 14 Jun 2016 13:24:33 +0000 (+0200) Subject: phase2: use pkgarch as unique partial directory name X-Git-Tag: v1~259 X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=ab77d5ca2d56474ff4a2836b14ad85fbefec1162 phase2: use pkgarch as unique partial directory name Signed-off-by: Jo-Philipp Wich --- diff --git a/phase2/master.cfg b/phase2/master.cfg index faba9c9..c029358 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~%(buildername)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~%(buildername)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~%(buildername)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