From 5e5d81d6a5149cecc3d6c7a372b4fd6f7051e57d Mon Sep 17 00:00:00 2001 From: classabbyamp Date: Thu, 25 Jun 2026 13:59:01 -0400 Subject: [PATCH] services/nomad/build/buildbot: cleanup fixes rm -f to handle builds where no packages were built disable PTY to prevent a race with stdin closing --- services/nomad/build/buildbot.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/nomad/build/buildbot.cfg b/services/nomad/build/buildbot.cfg index 00859070..bb02e0f1 100644 --- a/services/nomad/build/buildbot.cfg +++ b/services/nomad/build/buildbot.cfg @@ -280,7 +280,7 @@ esac @util.renderer def make_clean_cmd(props): - return ['rm', '-vr', util.Interpolate('/hostdir/binpkgs/%(prop:target)s-%(prop:buildnumber)s')] + return ['rm', '-vrf', util.Interpolate('/hostdir/binpkgs/%(prop:target)s-%(prop:buildnumber)s')] @util.renderer @@ -411,7 +411,7 @@ factory.addStep(steps.ShellCommand( descriptionDone='cleaned packages from hostdir', alwaysRun=True, logEnviron=False, - usePTY=True, + usePTY=False, workdir='.', timeout=14400, ))