SdkServce/Delete: Cleanup before deleting the chroot.
The chroot deletion occasionally takes longer than the 10 minute
timeout its been given. To facilitate the process, cleanup a few
directories before deleting the chroot itself.
BUG=chromium:1018217
TEST=run_tests
Change-Id: Idca4b20218e516ef6d3a01e0dda0f48f9ea706e1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1946444
Tested-by: Alex Klein <saklein@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Chris McDonald <cjmcdonald@chromium.org>
diff --git a/api/controller/sdk.py b/api/controller/sdk.py
index e48dc23..f017fd9 100644
--- a/api/controller/sdk.py
+++ b/api/controller/sdk.py
@@ -12,6 +12,7 @@
from chromite.api import controller
from chromite.api import faux
from chromite.api import validate
+from chromite.api.controller import controller_util
from chromite.lib import cros_build_lib
from chromite.service import sdk
@@ -88,4 +89,5 @@
@validate.validation_complete
def Delete(input_proto, _output_proto, _config):
"""Delete a chroot."""
- sdk.Delete(chroot_path=input_proto.chroot.path)
+ chroot = controller_util.ParseChroot(input_proto.chroot)
+ sdk.Delete(chroot)