From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 4 Jan 2017 12:57:29 +0000 (+0100)
Subject: phase1, phase2: use --progress for larger rsync uploads
X-Git-Tag: v1~199
X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=a578c3d737aa16ed48f1e96d426c3f09a362e28b

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@mein.io>
---

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