cbuildbot_launch: ignore failures in CleanupChroot stage for now
Since this is the last stage we run, and it exists only to unmount the
chroot (and some other house keeping), and the bots are currently setup
to always reboot after a run, and the reboot will also take care of
unmounting everything, and the next run will clean up any little bits
left over, we can ignore this failure for now.
BUG=chromium:1000034
TEST=CQ passes
Change-Id: If4b052d274f714a2a386f803fa3ca7fa72f96c3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1783120
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Mike Nichols <mikenichols@chromium.org>
diff --git a/scripts/cbuildbot_launch.py b/scripts/cbuildbot_launch.py
index 06b14ec..ae437b8 100644
--- a/scripts/cbuildbot_launch.py
+++ b/scripts/cbuildbot_launch.py
@@ -431,11 +431,18 @@
logging.exception('Cleaning up chroot timed out')
# Dump debug info to help https://crbug.com/1000034.
cros_build_lib.RunCommand(['mount'], error_code_ok=False)
+ cros_build_lib.RunCommand(['uname', '-a'], error_code_ok=False)
cros_build_lib.SudoRunCommand(['losetup', '-a'], error_code_ok=False)
cros_build_lib.RunCommand(['dmesg'], error_code_ok=False)
- return False
+ logging.warning('Assuming the bot is going to reboot, so ignoring this '
+ 'failure; see https://crbug.com/1000034')
- return True
+ # NB: We ignore errors at this point because this stage runs last. If the
+ # chroot failed to unmount, we're going to reboot the system once we're done,
+ # and that will implicitly take care of cleaning things up. If the bots stop
+ # rebooting after every run, we'll need to make this fatal all the time.
+ #
+ # TODO(crbug.com/1000034): This should be fatal all the time.
def ConfigureGlobalEnvironment():
@@ -520,8 +527,7 @@
SetLastBuildState(root, build_state)
with metrics.SecondsTimer(METRIC_CHROOT_CLEANUP):
- if not CleanupChroot(buildroot):
- result = 1
+ CleanupChroot(buildroot)
return result