Add ability to run smoke_Suite on x86-pre-flight-queue.

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 190 matching lines @@
               cwd=cwd, enter_chroot=True)
 
 
 def _UprevAllPackages(buildroot):
   """Uprevs all packages that have been updated since last uprev."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./cros_mark_all_as_stable',
               '--tracking_branch="cros/master"'],
               cwd=cwd, enter_chroot=True)
 
+
+def _GetVMConstants(buildroot):
+  """Returns minimum (vdisk_size, statefulfs_size) recommended for VM's."""
+  cwd = os.path.join(buildroot, 'src', 'scripts', 'lib')
+  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())
+
+
 # =========================== Main Commands ===================================
 
 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://src.chromium.org/git/manifest'],
              cwd=buildroot, input='\n\ny\n')
   RepoSync(buildroot, rw_checkout, retries)
 
@@ skipping 16 matching lines @@
   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 _BuildImage(buildroot):
   _WipeOldOutput(buildroot)
 
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./build_image', '--replace'], cwd=cwd, enter_chroot=True)
 
+
+def _BuildVMImageForTesting(buildroot):
+  (vdisk_size, statefulfs_size) = _GetVMConstants(buildroot)
+  cwd = os.path.join(buildroot, 'src', 'scripts')
+  RunCommand(['./image_to_vm.sh',
+              '--test_image',
+              '--full',
+              '--vdisk_size %s' % vdisk_size,
+              '--statefulfs_size %s' % statefulfs_size,
+              ], cwd=cwd, enter_chroot=True)
+
+
 def _RunUnitTests(buildroot):
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['./cros_run_unit_tests'], cwd=cwd, enter_chroot=True)
 
 
+def _RunSmokeSuite(buildroot):
+  cwd = os.path.join(buildroot, 'src', 'scripts')
+  RunCommand(['bin/cros_run_vm_test',
+              '--no_graphics',
+              '--test_case',
+              'suite_Smoke',
+              ], cwd=cwd, error_ok=True)
+
+
 def _UprevPackages(buildroot, revisionfile, board):
   """Uprevs a package based on given revisionfile.
 
   If revisionfile is set to None or does not resolve to an actual file, this
   function will uprev all packages.
 
   Keyword arguments:
   revisionfile -- string specifying a file that contains a list of revisions to
       uprev.
   """
@@ skipping 105 matching lines @@
       _SetupBoard(buildroot, board=buildconfig['board'])
 
     if buildconfig['uprev']:
       _UprevPackages(buildroot, revisionfile, board=buildconfig['board'])
 
     _Build(buildroot)
     if buildconfig['unittests']:
       _RunUnitTests(buildroot)
 
     _BuildImage(buildroot)
+
+    if buildconfig['smoke_bvt']:
+      _BuildVMImageForTesting(buildroot)
+      _RunSmokeSuite(buildroot)
+
     if buildconfig['uprev']:
       if buildconfig['master']:
         # Master bot needs to check if the other slaves completed.
         if cbuildbot_comm.HaveSlavesCompleted(config):
           _UprevPush(buildroot)
           _UprevCleanup(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()