Add package.keywords logic to build version of chrome we specify.

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
 import re
 import optparse
 import os
 import shutil
 import sys
 
 import cbuildbot_comm
 from cbuildbot_config import config
 
 sys.path.append(os.path.join(os.path.dirname(__file__), '../lib'))
 from cros_build_lib import (Die, Info, ReinterpretPathForChroot, RunCommand,
                             Warning)
 
 _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')
 
 # Currently, both the full buildbot and the preflight buildbot store their
 # data in a variable named PORTAGE_BINHOST, but they're in different files.
 # We're planning on joining the two files soon and renaming the full binhost
 # to FULL_BINHOST.
 _FULL_BINHOST = 'PORTAGE_BINHOST'
 _PREFLIGHT_BINHOST = 'PORTAGE_BINHOST'
 
 # ======================== Utility functions ================================
 
@@ skipping 170 matching lines @@
               '--board=%s' % board,
               '--tracking_branch=%s' % tracking_branch,
               '--overlays=%s' % ':'.join(chroot_overlays),
               '--packages=%s' % ':'.join(packages),
               '--drop_file=%s' % ReinterpretPathForChroot(_PACKAGE_FILE %
                   {'buildroot': buildroot}),
               'commit'],
              cwd=cwd, enter_chroot=True)
 
 
-def _MarkChromeAsStable(buildroot, tracking_branch, chrome_rev):
+def _MarkChromeAsStable(buildroot, tracking_branch, chrome_rev, board):
   """Returns the portage atom for the revved chrome ebuild - see man emerge."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   portage_atom_string = RunCommand(['bin/cros_mark_chrome_as_stable',
                                     '--tracking_branch=%s' % tracking_branch,
                                     chrome_rev], cwd=cwd, redirect_stdout=True,
                                     enter_chroot=True).rstrip()
   if not portage_atom_string:
     Info('Found nothing to rev.')
     return None
   else:
-    return portage_atom_string.split('=')[1]
+    chrome_atom = portage_atom_string.split('=')[1]
+    # TODO(sosa): Workaround to build unstable chrome ebuild we uprevved.
+    RunCommand(['sudo', 'tee', CHROME_KEYWORDS_FILE % {'board': board}],
+               input='=%s\n' % chrome_atom, enter_chroot=True,
+               cwd=cwd)
+    return chrome_atom
 
 
 def _UprevAllPackages(buildroot, tracking_branch, board, overlays):
   """Uprevs all packages that have been updated since last uprev."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
   chroot_overlays = [ReinterpretPathForChroot(path) for path in overlays]
   RunCommand(['./cros_mark_as_stable', '--all',
               '--board=%s' % board,
               '--overlays=%s' % ':'.join(chroot_overlays),
               '--tracking_branch=%s' % tracking_branch,
@@ skipping 167 matching lines @@
   cmd = ['./build_packages']
   if emptytree:
     cmd.insert(0, 'EXTRA_BOARD_FLAGS=--emptytree')
 
   RunCommand(cmd, cwd=cwd, enter_chroot=True)
 
 
 def _BuildChrome(buildroot, board, chrome_atom_to_build):
   """Wrapper for emerge call to build Chrome."""
   cwd = os.path.join(buildroot, 'src', 'scripts')
-  RunCommand(['ACCEPT_KEYWORDS="* ~*"', 'emerge-%s' % board,
+  RunCommand(['emerge-%s' % board,
               '=%s' % chrome_atom_to_build],
              cwd=cwd, enter_chroot=True)
 
 
 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)
@@ skipping 297 matching lines @@
 
     if not os.path.isdir(chroot_path):
       _MakeChroot(buildroot)
 
     if not os.path.isdir(boardpath):
       _SetupBoard(buildroot, board=buildconfig['board'])
 
     # 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)
+                                                 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)
 
     _EnableLocalAccount(buildroot)
     # Doesn't rebuild without acquiring more source.
@@ skipping 44 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()