Hide archive build output unless it fails.

buildbot/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
 import re
 import optparse
 import os
 import shutil
 import sys
 
 if __name__ == '__main__':
   import constants
   sys.path.append(constants.SOURCE_ROOT)
 
 import cbuildbot_comm
 from cbuildbot_config import config
 from chromite.lib.cros_build_lib import (Die, Info, ReinterpretPathForChroot,
-                                         OldRunCommand, Warning)
+                                         OldRunCommand, Warning, RunCommand)
 
 _DEFAULT_RETRIES = 3
 _PACKAGE_FILE = '%(buildroot)s/src/scripts/cbuildbot_package.list'
 ARCHIVE_BASE = '/var/www/archive'
 ARCHIVE_COUNT = 10
 PUBLIC_OVERLAY = '%(buildroot)s/src/third_party/chromiumos-overlay'
 PRIVATE_OVERLAY = '%(buildroot)s/src/private-overlays/chromeos-overlay'
 CHROME_KEYWORDS_FILE = ('/build/%(board)s/etc/portage/package.keywords/chrome')
 
 _FULL_BINHOST = 'PORTAGE_BINHOST'
 _PREFLIGHT_BINHOST = 'PREFLIGHT_BINHOST'
 _CHROME_BINHOST = 'CHROME_BINHOST'
+_CROS_ARCHIVE_URL = 'CROS_ARCHIVE_URL'
 
 # ======================== Utility functions ================================
 
 def _PrintFile(path):
   """Prints out the contents of a file to stderr."""
   file_handle = open(path)
   print >> sys.stderr, file_handle.read()
   file_handle.close()
   sys.stderr.flush()
 
@@ skipping 447 matching lines @@
         ]
   if dryrun:
     cmd.append('--dryrun')
 
   cmd.append('push')
   OldRunCommand(cmd, cwd=cwd)
 
 
 def _LegacyArchiveBuild(buildroot, bot_id, buildconfig, buildnumber,
                         test_tarball, debug=False):
-  """Adds a step to the factory to archive a build."""
+  """Archives build artifacts and returns URL to archived location."""
 
   # Fixed properties
   keep_max = 3
   gsutil_archive = 'gs://chromeos-archive/' + bot_id
   cwd = os.path.join(buildroot, 'src', 'scripts')
   cmd = ['./archive_build.sh',
          '--build_number', str(buildnumber),
          '--to', '/var/www/archive/' + bot_id,
          '--keep_max', str(keep_max),
          '--board', buildconfig['board'],
          '--acl', '/home/chrome-bot/slave_archive_acl',
          '--gsutil_archive', gsutil_archive,
          '--gsd_gen_index',
            '/b/scripts/gsd_generate_index/gsd_generate_index.py',
          '--gsutil', '/b/scripts/slave/gsutil',
   ]
   # Give the right args to archive_build.
   if buildconfig['archive_build_prebuilts']: cmd.append('--prebuilt_upload')
   if buildconfig.get('factory_test_mod', True): cmd.append('--factory_test_mod')
   if not buildconfig['archive_build_debug']: cmd.append('--noarchive_debug')
   if not buildconfig.get('test_mod'): cmd.append('--notest_mod')
   if test_tarball: cmd.extend(['--test_tarball', test_tarball])
   if debug: cmd.append('--debug')
   if buildconfig.get('factory_install_mod', True):
     cmd.append('--factory_install_mod')
 
-  OldRunCommand(cmd, cwd=cwd)
+  try:
+    result = RunCommand(cmd, cwd=cwd, redirect_stdout=True,

[petkov, 2011/02/17 19:31:14]

Does this print the command? If not, can you Info "Archiving..." or something
like that?

+                        redirect_stderr=True, combine_stdout_stderr=True)
+  except:
+    Warning(result.stdout)
+    raise
+
+  archive_url = None
+  key_re = re.compile('^%s=(.*)$' % _CROS_ARCHIVE_URL)
+  for line in result.output.splitlines():
+    line_match = key_re.match(line)
+    if line_match:
+      archive_url = line_match.group(1)
+
+  assert archive_url, 'Archive Build Failed to Provide Archive URL'
+  return archive_url
 
 
 def _ArchiveTestResults(buildroot, test_results_dir):
   """Archives the test results into a tarball and returns a path to it.
 
   Arguments:
     buildroot: Root directory where build occurs
     test_results_dir: Path from buildroot/chroot to find test results.
       This must a subdir of /tmp.
   Returns:
@@ skipping 137 matching lines @@
   parser.add_option('-u', '--url', dest='url',
                     default='http://git.chromium.org/git/manifest',
                     help='Run the buildbot on internal manifest')
 
   (options, args) = parser.parse_args()
 
   buildroot = os.path.abspath(options.buildroot)
   revisionfile = options.revisionfile
   tracking_branch = options.tracking_branch
   chrome_atom_to_build = None
+  archive_url = None
 
   if len(args) >= 1:
     bot_id = args[-1]
     buildconfig = _GetConfig(bot_id)
   else:
     Warning('Missing configuration description')
     parser.print_usage()
     sys.exit(1)
 
   try:
@@ skipping 60 matching lines @@
 
     if buildconfig['vm_tests'] and options.tests:
       _BuildVMImageForTesting(buildroot)
       test_results_dir = '/tmp/run_remote_tests.%s' % options.buildnumber
       try:
         _RunSmokeSuite(buildroot, test_results_dir)
         _RunAUTest(buildroot, buildconfig['board'])
       finally:
         test_tarball = _ArchiveTestResults(buildroot,
                                            test_results_dir=test_results_dir)
-        _LegacyArchiveBuild(buildroot, bot_id, buildconfig, options.buildnumber,
-                            test_tarball, options.debug)
+        archive_url = _LegacyArchiveBuild(buildroot, bot_id, buildconfig,
+                                          options.buildnumber, test_tarball,
+                                          options.debug)
 
     # Don't push changes for developers.
     if buildconfig['master']:
       # Master bot needs to check if the other slaves completed.
       if cbuildbot_comm.HaveSlavesCompleted(config):
         if not options.debug and options.prebuilts:
           _UploadPrebuilts(buildroot, board, buildconfig['rev_overlays'],
                            [new_binhost], options.chrome_rev)
         _UprevPush(buildroot, tracking_branch, buildconfig['board'],
                    push_overlays, options.debug)
       else:
         Die('CBUILDBOT - One of the slaves has failed!!!')
 
     else:
       # Publish my status to the master if its expecting it.
       if buildconfig['important'] and not options.debug:
         cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_COMPLETE)
 
   except:
     # Send failure to master bot.
     if not buildconfig['master'] and buildconfig['important']:
       cbuildbot_comm.PublishStatus(cbuildbot_comm.STATUS_BUILD_FAILED)
 
     raise
 
+  finally:
+    if archive_url:
+      Info('BUILD ARTIFACTS FOR THIS BUILD CAN BE FOUND AT:')
+      Info(archive_url)
+
 
 if __name__ == '__main__':
     main()