[buildbot] phase2: reduce verbosity of rsync and use rsync.sh helper
LEDE Commits
lede-commits at lists.infradead.org
Thu Nov 16 03:48:40 PST 2023
ynezz pushed a commit to buildbot.git, branch master:
https://git.openwrt.org/30efc2c97c42b58a5404133f6ff9fb398bb3e551
commit 30efc2c97c42b58a5404133f6ff9fb398bb3e551
Author: Thibaut VARÈNE <hacks at slashdirt.org>
AuthorDate: Wed Nov 15 11:50:01 2023 +0100
phase2: reduce verbosity of rsync and use rsync.sh helper
Align with phase1 (e55b76f)
This patch:
- removes '--progress' rsync parameter
- uses the wrapper script 'rsync.sh'
Signed-off-by: Thibaut VARÈNE <hacks at slashdirt.org>
---
phase2/master.cfg | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/phase2/master.cfg b/phase2/master.cfg
index 59443b8..f05c60f 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -680,6 +680,13 @@ for arch in arches:
haltOnFailure = True
))
+ factory.addStep(FileDownload(
+ name="dlrsync.sh",
+ mastersrc = scripts_dir + "/rsync.sh",
+ workerdest = "../rsync.sh",
+ mode = 0o755
+ ))
+
factory.addStep(ShellCommand(
name = "uploadprepare",
description = "Preparing package directory",
@@ -694,7 +701,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]), "-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])],
+ command = ["../../../rsync.sh"] + rsync_defopts + ["--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
@@ -734,7 +741,7 @@ for arch in arches:
name = "logupload",
description = "Uploading failure logs",
workdir = "build/sdk",
- command = ["rsync"] + rsync_defopts + ["--progress", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-az", "faillogs/", Interpolate("%(kw:rsyncbinurl)s/faillogs%(kw:suffix)s/%(kw:archname)s/", rsyncbinurl=rsync_bin_url, suffix=GetDirectorySuffix, archname=arch[0])],
+ command = ["../../../rsync.sh"] + rsync_defopts + ["--delete", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-az", "faillogs/", Interpolate("%(kw:rsyncbinurl)s/faillogs%(kw:suffix)s/%(kw:archname)s/", rsyncbinurl=rsync_bin_url, suffix=GetDirectorySuffix, archname=arch[0])],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = False,
flunkOnFailure = False,
@@ -755,7 +762,7 @@ for arch in arches:
name = "sourceupload",
description = "Uploading source archives",
workdir = "build/sdk",
- command = ["rsync"] + rsync_defopts + ["--files-from=sourcelist", "--progress", "--checksum", "--delay-updates",
+ command = ["../../../rsync.sh"] + rsync_defopts + ["--files-from=sourcelist", "--checksum", "--delay-updates",
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,
More information about the lede-commits
mailing list