From: Thibaut VARÈNE Date: Wed, 15 Nov 2023 09:35:44 +0000 (+0100) Subject: phase2: don't enable rsync compression where unnecessary X-Git-Tag: v10~7 X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=9a9548915d5dcc0a246916c4088a186a53d49d8f phase2: don't enable rsync compression where unnecessary Align with phase1 (cf7b9ba) Signed-off-by: Thibaut VARÈNE --- diff --git a/phase2/master.cfg b/phase2/master.cfg index e070da9..59443b8 100644 --- a/phase2/master.cfg +++ b/phase2/master.cfg @@ -694,7 +694,7 @@ for arch in arches: name = "packageupload", description = "Uploading package files", workdir = "build/sdk", - command = ["rsync"] + rsync_defopts + ["--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-az", "bin/packages/%s/" %(arch[0]), Interpolate("%(kw:rsyncbinurl)s/packages%(kw:suffix)s/%(kw:archname)s/", rsyncbinurl=rsync_bin_url, suffix=GetDirectorySuffix, archname=arch[0])], + command = ["rsync"] + rsync_defopts + ["--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-a", "bin/packages/%s/" %(arch[0]), Interpolate("%(kw:rsyncbinurl)s/packages%(kw:suffix)s/%(kw:archname)s/", rsyncbinurl=rsync_bin_url, suffix=GetDirectorySuffix, archname=arch[0])], env={'RSYNC_PASSWORD': rsync_bin_key}, haltOnFailure = True, logEnviron = False @@ -756,7 +756,7 @@ for arch in arches: description = "Uploading source archives", workdir = "build/sdk", command = ["rsync"] + rsync_defopts + ["--files-from=sourcelist", "--progress", "--checksum", "--delay-updates", - Interpolate("--partial-dir=.~tmp~%(kw:archname)s~%(prop:workername)s", archname=arch[0]), "-az", "dl/", "%s/" %(rsync_src_url)], + Interpolate("--partial-dir=.~tmp~%(kw:archname)s~%(prop:workername)s", archname=arch[0]), "-a", "dl/", "%s/" %(rsync_src_url)], env={'RSYNC_PASSWORD': rsync_src_key}, haltOnFailure = False, flunkOnFailure = False,