Add simple update test to pfq.

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 heapq
@@ skipping 397 matching lines @@
     shutil.rmtree(results_dir_in_chroot)
 
   cwd = os.path.join(buildroot, 'src', 'scripts')
   RunCommand(['bin/cros_run_vm_test',
               '--no_graphics',
               '--results_dir_root=%s' % results_dir,
               'suite_Smoke',
               ], cwd=cwd, error_ok=False)
 
 
+def _RunAUTest(buildroot, board):
+  """Runs a basic update test from the au test harness."""
+  cwd = os.path.join(buildroot, 'src', 'scripts')
+  image_path = os.path.join(buildroot, 'src', 'build', 'images', board,
+                            'latest', 'chromiumos_test_image.bin')
+  RunCommand(['bin/cros_au_test_harness',
+              '--no_graphics',
+              '--no_delta',
+              '--board=%s' % board,
+              '--test_prefix=SimpleTest',
+              '--verbose',
+              '--base_image=%s' % image_path,
+              '--target_image=%s' % image_path,
+              ], cwd=cwd, error_ok=False)
+
+
 def _UprevPackages(buildroot, tracking_branch, revisionfile, board, overlays):
   """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 249 matching lines @@
 
     # Perform uprev.  If chrome_uprev is set, rev Chrome ebuilds.
     if options.chrome_rev:
       chrome_atom_to_build = _MarkChromeAsStable(buildroot, tracking_branch,
                                                  options.chrome_rev, board)
       # If we found nothing to rev, we're done here.
       if not chrome_atom_to_build:
         return
 
     elif buildconfig['uprev']:
-      _UprevPackages(buildroot, tracking_branch, revisionfile,
-                     buildconfig['board'], rev_overlays)
+      #_UprevPackages(buildroot, tracking_branch, revisionfile,

[petkov, 2011/01/07 22:17:29]

why is this code commented out? remove? there's more commented out code below...

[sosa, 2011/01/07 23:28:44]

Done.

+      #               buildconfig['board'], rev_overlays)
+      pass
 
     _EnableLocalAccount(buildroot)
-    _Build(buildroot, emptytree)
+    #_Build(buildroot, emptytree)
 
-    if buildconfig['unittests'] and options.tests:
-      _RunUnitTests(buildroot)
+    #if buildconfig['unittests'] and options.tests:
+    #  _RunUnitTests(buildroot)
 
-    _BuildImage(buildroot)
+    #_BuildImage(buildroot)
 
-    if buildconfig['smoke_bvt'] and options.tests:
+    if buildconfig['tests'] and options.tests:
       _BuildVMImageForTesting(buildroot)
       test_results_dir = '/tmp/run_remote_tests.%s' % options.buildnumber
       try:
-        _RunSmokeSuite(buildroot, test_results_dir)
+       #_RunSmokeSuite(buildroot, test_results_dir)
+        _RunAUTest(buildroot, buildconfig['board'])
       finally:
         if not options.debug:
           archive_full_path = os.path.join(options.gsutil_archive,
-                                         str(options.buildnumber))
+                                           str(options.buildnumber))
           _ArchiveTestResults(buildroot, buildconfig['board'],
                               test_results_dir=test_results_dir,
                               gsutil=options.gsutil,
                               archive_dir=archive_full_path,
                               acl=options.acl)
 
     if buildconfig['uprev']:
       # Don't push changes for developers.
       if buildconfig['master']:
         # Master bot needs to check if the other slaves completed.
@@ skipping 14 matching lines @@
   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()