From: Jo-Philipp Wich <jo@mein.io>
Date: Fri, 21 Jun 2019 06:56:24 +0000 (+0200)
Subject: phase2: improve source archive uploading
X-Git-Tag: v1~111
X-Git-Url: http://git.openwrt.org/?p=buildbot.git;a=commitdiff_plain;h=3dc27d361a6f6153db07638a82bcb6bac30534fb

phase2: improve source archive uploading

Only upload source archives which have been updated sicne the begin
of the build.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/phase2/master.cfg b/phase2/master.cfg
index b3c1574..5a3f005 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -478,11 +478,19 @@ for arch in arches:
 	))
 
 	if rsync_src_url is not None:
+		factory.addStep(ShellCommand(
+			name = "sourcelist",
+			description = "Finding source archives to upload",
+			workdir = "build/sdk",
+			command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -newer ../sdk.archive -printf '%f\\n' > sourcelist",
+			haltOnFailure = True
+		))
+
 		factory.addStep(ShellCommand(
 			name = "sourceupload",
 			description = "Uploading source archives",
 			workdir = "build/sdk",
-			command = ["rsync", "-4", "--progress", "--checksum", "--delay-updates",
+			command = ["rsync", "--files-from=sourcelist", "-4", "--progress", "--checksum", "--delay-updates",
 			           WithProperties("--partial-dir=.~tmp~%s~%%(slavename)s" %(arch[0])), "-avz", "dl/", "%s/" %(rsync_src_url)],
 			env={'RSYNC_PASSWORD': rsync_src_key},
 			haltOnFailure = False,