Change preflight cleanup process to always be run before any run.

bin/cbuildbot.py

 #!/usr/bin/python
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """CBuildbot is wrapper around the build process used by the pre-flight queue"""
 
 import errno
 import re
@@ skipping 200 matching lines @@
   source_cmd = 'source %s/cros_vm_constants.sh' % cwd
   vdisk_size = RunCommand([
       '/bin/bash', '-c', '%s && echo $MIN_VDISK_SIZE_FULL' % source_cmd],
        redirect_stdout=True)
   statefulfs_size = RunCommand([
       '/bin/bash', '-c', '%s && echo $MIN_STATEFUL_FS_SIZE_FULL' % source_cmd],
        redirect_stdout=True)
   return (vdisk_size.strip(), statefulfs_size.strip())
 
 
+def _GitCleanup(buildroot):
+  """Clean up git branch after previous uprev attempt."""
+  cwd = os.path.join(buildroot, 'src', 'scripts')
+  if os.path.exists(cwd):
+    RunCommand(['./cros_mark_as_stable', '--srcroot=..',
+                '--tracking_branch="cros/master"', 'clean'],
+               cwd=cwd, error_ok=True)
+
+
+def _CleanUpMountPoints(buildroot):
+  """Cleans up any stale mount points from previous runs."""
+  mount_output = RunCommand(['mount'], redirect_stdout=True)
+  mount_pts_in_buildroot = RunCommand(['grep', buildroot], input=mount_output,
+                                      redirect_stdout=True, error_ok=True)

[scottz, 2010/10/22 00:07:32]

if you are going to do this, you might as well just pipe it above no? 

+
+  for mount_pt_str in mount_pts_in_buildroot.splitlines():
+    mount_pt = mount_pt_str.rpartition(' type ')[0].partition(' on ')[2]
+    RunCommand(['sudo', 'umount', '-l', mount_pt], error_ok=True)
+
+
+def _WipeOldOutput(buildroot):
+  """Wipes out build output directories."""
+  RunCommand(['rm', '-rf', 'src/build/images'], cwd=buildroot)
+
+
 # =========================== Main Commands ===================================
 
+
+def _PreFlightRinse(buildroot):
+  """Cleans up any leftover state from previous runs."""
+  _GitCleanup(buildroot)
+  _CleanUpMountPoints(buildroot)
+  RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
+
+
 def _FullCheckout(buildroot, rw_checkout=True, retries=_DEFAULT_RETRIES):
   """Performs a full checkout and clobbers any previous checkouts."""
   RunCommand(['sudo', 'rm', '-rf', buildroot])
   MakeDir(buildroot, parents=True)
   RunCommand(['repo', 'init', '-u', 'http://git.chromium.org/git/manifest'],
              cwd=buildroot, input='\n\ny\n')
   RepoSync(buildroot, rw_checkout, retries)
 
 
-def _PreFlightRinse(buildroot):
-  """Cleans up any leftover state from previous runs."""
-  RunCommand(['sudo', 'killall', 'kvm'], error_ok=True)
-  _UprevCleanup(buildroot, error_ok=True)
-
-
 def _IncrementalCheckout(buildroot, rw_checkout=True,
                          retries=_DEFAULT_RETRIES):
   """Performs a checkout without clobbering previous checkout."""
   RepoSync(buildroot, rw_checkout, retries)
 
 
 def _MakeChroot(buildroot):
   """Wrapper around make_chroot."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./make_chroot', '--fast'], cwd=cwd)
 
 
 def _SetupBoard(buildroot, board='x86-generic'):
   """Wrapper around setup_board."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./setup_board', '--fast', '--default', '--board=%s' % board],
              cwd=cwd, enter_chroot=True)
 
 
 def _Build(buildroot):
   """Wrapper around build_packages."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./build_packages'], cwd=cwd, enter_chroot=True)
 
 
-def _WipeOldOutput(buildroot):
-  RunCommand(['rm', '-rf', 'src/build/images'], cwd=buildroot)
-
-
 def _EnableLocalAccount(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   # Set local account for test images.
   RunCommand(['./enable_localaccount.sh',
              'chronos'],
              print_cmd=False, cwd=cwd)
 
 
 def _BuildImage(buildroot):
   _WipeOldOutput(buildroot)
@@ skipping 54 matching lines @@
   #if revisions != 'None':
   #  print >> sys.stderr, 'CBUILDBOT Revision list found %s' % revisions
   #  revision_list = _ParseRevisionString(revisions,
   #      _CreateRepoDictionary(buildroot, board))
   #  _UprevFromRevisionList(buildroot, revision_list)
   #else:
   Info('CBUILDBOT Revving all')
   _UprevAllPackages(buildroot)
 
 
-def _UprevCleanup(buildroot, error_ok=False):
-  """Clean up after a previous uprev attempt."""
-  cwd = os.path.join(buildroot, 'src', 'scripts')
-  RunCommand(['./cros_mark_as_stable', '--srcroot=..',
-              '--tracking_branch="cros/master"', 'clean'],
-             cwd=cwd, error_ok=error_ok)
-
-
 def _UprevPush(buildroot):
   """Pushes uprev changes to the main line."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./cros_mark_as_stable', '--srcroot=..',
               '--tracking_branch="cros/master"',
               '--push_options="--bypass-hooks -f"', 'push'],
              cwd=cwd)
 
 
 def _GetConfig(config_name):
@@ skipping 32 matching lines @@
                     default=False,
                     help='Clobbers an old checkout before syncing')
   parser.add_option('--debug', action='store_true', dest='debug',
                     default=False,
                     help='Override some options to run as a developer.')
   (options, args) = parser.parse_args()
 
   buildroot = options.buildroot
   revisionfile = options.revisionfile
 
-  # Passed option to clobber.
-  if options.clobber:
-    RunCommand(['sudo', 'rm', '-rf', buildroot])
-
   if len(args) >= 1:
     buildconfig = _GetConfig(args[-1])
   else:
     Warning('Missing configuration description')
     parser.print_usage()
     sys.exit(1)
 
   try:
-    if not os.path.isdir(buildroot):
+    _PreFlightRinse(buildroot)
+    if options.clobber or not os.path.isdir(buildroot):
       _FullCheckout(buildroot)
     else:
-      _PreFlightRinse(buildroot)
       _IncrementalCheckout(buildroot)
 
     chroot_path = os.path.join(buildroot, 'chroot')
     if not os.path.isdir(chroot_path):
       _MakeChroot(buildroot)
 
     boardpath = os.path.join(chroot_path, 'build', buildconfig['board'])
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
 
@@ skipping 12 matching lines @@
       _RunSmokeSuite(buildroot)
 
     if buildconfig['uprev']:
       # Don't push changes for developers.
       if not options.debug:
         if buildconfig['master']:
           # Master bot needs to check if the other slaves completed.
           if cbuildbot_comm.HaveSlavesCompleted(config):
             _UprevPush(buildroot)
           else:
-            # At least one of the slaves failed or we timed out.
-            _UprevCleanup(buildroot)
             Die('CBUILDBOT - One of the slaves has failed!!!')
 
         else:
           # Publish my status to the master if its expecting it.
           if buildconfig['important']:
             cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
 
-      _UprevCleanup(buildroot)
   except:
     # Send failure to master bot.
     if not buildconfig['master'] and buildconfig['important']:
       cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_FAILED)
 
     raise
 
 
 if __name__ == '__main__':
     main()