builders.py: At the end of trigger builds use rm rather than clobber to clean up

Since clobber is crossing two file systems in this case the worker
can delete the files faster than it can move them

Also fixes a occasional race that results in build failures

Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Steve Sakoman 2020-07-14 08:22:07 -10:00 committed by Richard Purdie
parent 9176ca6427
commit ad5c6f7089

View File

@ -377,9 +377,9 @@ def create_parent_builder_factory(buildername, waitname):
factory.addStep(steps.ShellCommand(
command=[clob, util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir))],
command=["rm", "-fr", util.Interpolate("{}/%(prop:buildername)s-%(prop:buildnumber)s".format(config.sharedrepodir))],
haltOnFailure=True,
name="Clobber shared repo dir"))
name="Remove shared repo dir"))
return factory