phase1, phase2: exclude temporary source files from sourceupload step

When the dl/ directory is shared with several workers, there can be
temporary "*.hash" and "*.dl" files being created by other workers.
These files should be excluded from the sourceupload step, otherwise it
can cause a failure when rsync tries to read them.

See for example:

  https://buildbot.openwrt.org/master/packages/#/builders/14/builds/18/steps/39/logs/stdio

Signed-off-by: Baptiste Jonglez <git@bitsofnetworks.org>

diff --git a/phase1/master.cfg b/phase1/master.cfg
index 7e19e9e6acafcc1feb22202ee21a7aa1af6bd7e7..a1f7deae69f4ca5983866f9ea7e6c99fbdc16232 100644 (file)
--- a/phase1/master.cfg
+++ b/phase1/master.cfg
@@ -1329,7 +1329,7 @@ for target in targets:
                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",
+                       command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -not -name '*.hash' -not -name '*.dl' -newer .config -printf '%f\\n' > sourcelist",
                        haltOnFailure = True
                ))
 

diff --git a/phase2/master.cfg b/phase2/master.cfg
index 6a0f39fd3c8d0b852c16f4c07b1bea6d689a0b20..b5050e578cf2c8909e5d2eba1ef09b3ce225e312 100644 (file)
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -735,7 +735,7 @@ for arch in arches:
                        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",
+                       command = "find dl/ -maxdepth 1 -type f -not -size 0 -not -name '.*' -not -name '*.hash' -not -name '*.dl' -newer ../sdk.archive -printf '%f\\n' > sourcelist",
                        haltOnFailure = True
                ))