[buildbot] phase1, phase2: use --progress for larger rsync uploads
LEDE Commits
lede-commits at lists.infradead.org
Wed Jan 4 04:58:38 PST 2017
jow pushed a commit to buildbot.git, branch master:
https://git.lede-project.org/a578c3d737aa16ed48f1e96d426c3f09a362e28b
commit a578c3d737aa16ed48f1e96d426c3f09a362e28b
Author: Jo-Philipp Wich <jo at mein.io>
AuthorDate: Wed Jan 4 13:57:29 2017 +0100
phase1, phase2: use --progress for larger rsync uploads
This avoids build step timeouts on slaves with weak connectivity to the
central rsync server.
Signed-off-by: Jo-Philipp Wich <jo at mein.io>
---
phase1/master.cfg | 4 ++--
phase2/master.cfg | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/phase1/master.cfg b/phase1/master.cfg
index 567dfec..e1a74c4 100644
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -615,7 +615,7 @@ for target in targets:
factory.addStep(ShellCommand(
name = "targetupload",
description = "Uploading target files",
- command=["rsync", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
+ command=["rsync", "--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]),
"-avz", WithProperties("bin/targets/%s/%s%%(libc)s/" %(ts[0], ts[1])),
WithProperties("%s/%%(prefix)stargets/%s/%s/" %(rsync_bin_url, ts[0], ts[1]), prefix=GetVersionPrefix)],
env={'RSYNC_PASSWORD': rsync_bin_key},
@@ -627,7 +627,7 @@ for target in targets:
factory.addStep(ShellCommand(
name = "sourceupload",
description = "Uploading source archives",
- command=["rsync", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%s" %(ts[0], ts[1]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+ command=["rsync", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s~%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 ce40644..4e9df39 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -346,7 +346,7 @@ for arch in arches:
name = "packageupload",
description = "Uploading package files",
workdir = "build/sdk",
- command = ["rsync", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "bin/packages/%s/" %(arch[0]), WithProperties("%s/packages%%(suffix)s/%s/" %(rsync_bin_url, arch[0]), suffix=GetDirectorySuffix)],
+ command = ["rsync", "--progress", "--delete", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "bin/packages/%s/" %(arch[0]), WithProperties("%s/packages%%(suffix)s/%s/" %(rsync_bin_url, arch[0]), suffix=GetDirectorySuffix)],
env={'RSYNC_PASSWORD': rsync_bin_key},
haltOnFailure = True,
logEnviron = False
@@ -382,7 +382,7 @@ for arch in arches:
name = "logupload",
description = "Uploading failure logs",
workdir = "build/sdk",
- command = ["rsync", "--delete", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "faillogs/", "%s/faillogs/%s/" %(rsync_bin_url, arch[0])],
+ command = ["rsync", "--progress", "--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
@@ -393,7 +393,7 @@ for arch in arches:
name = "sourceupload",
description = "Uploading source archives",
workdir = "build/sdk",
- command = ["rsync", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "dl/", "%s/" %(rsync_src_url)],
+ command = ["rsync", "--progress", "--checksum", "--delay-updates", "--partial-dir=.~tmp~%s" %(arch[0]), "-avz", "dl/", "%s/" %(rsync_src_url)],
env={'RSYNC_PASSWORD': rsync_src_key},
haltOnFailure = False,
logEnviron = False
More information about the lede-commits
mailing list