phase1: improve source archive uploading
authorJo-Philipp Wich <jo@mein.io>
Fri, 21 Jun 2019 06:55:18 +0000 (08:55 +0200)
committerJo-Philipp Wich <jo@mein.io>
Fri, 21 Jun 2019 06:55:18 +0000 (08:55 +0200)
Only upload source archives which have been updated sicne the begin
of the build.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
phase1/master.cfg

index 665d41ee364e95bfa0366dd388622b8b771839e3..6dfc37825878cf32e5a69857526babd8926d4290 100644 (file)
@@ -997,10 +997,17 @@ for target in targets:
                ))
 
        if rsync_src_url is not None:
+               factory.addStep(ShellCommand(
+                       name = "sourcelist",
+                       description = "Finding source archives to upload",
+                       command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -newer .config -printf '%f\\n' > sourcelist",
+                       haltOnFailure = True
+               ))
+
                factory.addStep(ShellCommand(
                        name = "sourceupload",
                        description = "Uploading source archives",
-                       command=["../rsync.sh", "--size-only", "--delay-updates"] + rsync_defopts +
+                       command=["../rsync.sh", "--files-from=sourcelist", "--size-only", "--delay-updates"] + rsync_defopts +
                                 [Interpolate("--partial-dir=.~tmp~%(kw:target)s~%(kw:subtarget)s~%(prop:slavename)s", target=ts[0], subtarget=ts[1]), "-a", "dl/", "%s/" %(rsync_src_url)],
                        env={'RSYNC_PASSWORD': rsync_src_key},
                        haltOnFailure = True,