commit 7a63ee7f8a8b750b8d228d6b55f9e57e74a4e68c
author Mike Frysinger <vapier@chromium.org> Tue Sep 03 14:24:06 2019 -0400
committer Mike Frysinger <vapier@chromium.org> Wed Sep 04 08:45:22 2019 +0000
tree 365360e79035e13ee97a9cdf9c3684479bb2cb58
parent e5b88621139c748f6ee0a217feff03606bda7752

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>

scripts/cbuildbot_launch_unittest.py

diff --git a/scripts/cbuildbot_launch_unittest.py b/scripts/cbuildbot_launch_unittest.py
index 46e08bc..bef0991 100644
--- a/scripts/cbuildbot_launch_unittest.py
+++ b/scripts/cbuildbot_launch_unittest.py
@@ -753,8 +753,7 @@
     """Check CleanupChroot without a chroot."""
     self.StartPatcher(cros_test_lib.RunCommandMock())
     with mock.patch.object(cros_sdk_lib, 'CleanupChrootMount'):
-      ret = cbuildbot_launch.CleanupChroot(self.buildroot)
-      self.assertTrue(ret)
+      cbuildbot_launch.CleanupChroot(self.buildroot)
 
   def testCleanupChrootNormal(self):
     """Check normal CleanupChroot."""
@@ -762,8 +761,7 @@
     osutils.Touch(self.chroot + '.img')
     self.StartPatcher(cros_test_lib.RunCommandMock())
     with mock.patch.object(cros_sdk_lib, 'CleanupChrootMount'):
-      ret = cbuildbot_launch.CleanupChroot(self.buildroot)
-      self.assertTrue(ret)
+      cbuildbot_launch.CleanupChroot(self.buildroot)
 
   def testCleanupChrootTimeout(self):
     """Check timeouts in CleanupChroot."""
@@ -773,5 +771,4 @@
     rc_mock.SetDefaultCmdResult()
     with mock.patch.object(cros_sdk_lib, 'CleanupChrootMount',
                            side_effect=timeout_util.TimeoutError):
-      ret = cbuildbot_launch.CleanupChroot(self.buildroot)
-      self.assertFalse(ret)
+      cbuildbot_launch.CleanupChroot(self.buildroot)