- Fix syntax error in expire.sh script
- Download expire.sh into parent directory
- Ensure that lifetime argument is passed as string when invoking expire.sh
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
elif [ $tree_age -ge $max_lifetime ]; then
echo "The build tree reached its maximum lifetime, cleaning up."
- find . -mindepth 1 -maxdepth 1 -print0 | xargs -r -0 rm -vrf | while read entry do
+ find . -mindepth 1 -maxdepth 1 -print0 | xargs -r -0 rm -vrf | while read entry; do
printf "."
done
if tree_expire > 0:
factory.addStep(FileDownload(
mastersrc = "expire.sh",
- slavedest = "expire.sh",
+ slavedest = "../expire.sh",
mode = 0755))
factory.addStep(ShellCommand(
name = "expire",
description = "Checking for build tree expiry",
- command = ["./expire.sh", tree_expire],
+ command = ["./expire.sh", str(tree_expire)],
workdir = ".",
haltOnFailure = True,
timeout = 2400))