[PATCH buildbot v2] phase1, phase2: exclude temporary source files from sourceupload step
Baptiste Jonglez
baptiste at bitsofnetworks.org
Wed Mar 24 22:28:25 GMT 2021
From: Baptiste Jonglez <git at bitsofnetworks.org>
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 at bitsofnetworks.org>
---
phase1/master.cfg | 2 +-
phase2/master.cfg | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/phase1/master.cfg b/phase1/master.cfg
index 363d77e..725d55e 100644
--- 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 4d5e595..7b103e8 100644
--- a/phase2/master.cfg
+++ b/phase2/master.cfg
@@ -727,7 +727,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
))
--
2.30.1
More information about the openwrt-devel
mailing list