commit 59a0a2b487eebaa5cd53ecab222b8554b3d35c79
author David James <davidjames@chromium.org> Fri Mar 22 14:04:44 2013 -0700
committer ChromeBot <chrome-bot@google.com> Fri Mar 22 17:55:56 2013 -0700
tree 2a373e51a35f912cb4050961881ca2d71367b8bc
parent 1a9b2fc8ff2a5f6966041263bd2c7eebdba35530

Add option for using the latest toolchain.

Right now, toolchain developers don't have any easy way of testing their CLs on
all bots. We should add this capability so that they can test their changes.

To actually add this capability, I needed to split BuildBoard into
Build{SDK,Board}. This cleans up our interface a bit.

I also added the ability to run bootstrap on any bot.

BUG=none
TEST=Launch remote trybots with this CL and CL:45649.

Change-Id: I38344ab11ca0ff1601a5e61a0a714628d8878fda
Reviewed-on: https://gerrit.chromium.org/gerrit/46167
Reviewed-by: David James <davidjames@chromium.org>
Tested-by: David James <davidjames@chromium.org>
Reviewed-by: Ryan Cui <rcui@chromium.org>
Commit-Queue: David James <davidjames@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 637f503..b6d01a7 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -44,8 +44,6 @@
 from chromite.lib import sudo
 
 
-cros_build_lib.STRICT_SUDO = True
-
 _DEFAULT_LOG_DIR = 'cbuildbot_logs'
 _BUILDBOT_LOG_FILE = 'cbuildbot.log'
 _DEFAULT_EXT_BUILDROOT = 'trybot'
@@ -382,7 +380,8 @@
     # TODO(sosa): Split these out into classes.
     if self.build_config['build_type'] == constants.CHROOT_BUILDER_TYPE:
       self._RunStage(stages.UprevStage, boards=[], enter_chroot=False)
-      self._RunStage(stages.BuildBoardStage, [constants.CHROOT_BUILDER_BOARD])
+      self._RunStage(stages.InitSDKStage)
+      self._RunStage(stages.SetupBoardStage, [constants.CHROOT_BUILDER_BOARD])
       self._RunStage(stages.SyncChromeStage)
       self._RunStage(stages.PatchChromeStage)
       self._RunStage(stages.SDKPackageStage)
@@ -390,11 +389,13 @@
       self._RunStage(stages.UploadPrebuiltsStage,
                      constants.CHROOT_BUILDER_BOARD, None)
     elif self.build_config['build_type'] == constants.REFRESH_PACKAGES_TYPE:
-      self._RunStage(stages.BuildBoardStage)
+      self._RunStage(stages.InitSDKStage)
+      self._RunStage(stages.SetupBoardStage)
       self._RunStage(stages.RefreshPackageStatusStage)
     else:
-      self._RunStage(stages.BuildBoardStage)
+      self._RunStage(stages.InitSDKStage)
       self._RunStage(stages.UprevStage)
+      self._RunStage(stages.SetupBoardStage)
       self._RunStage(stages.SyncChromeStage)
       self._RunStage(stages.PatchChromeStage)
 
@@ -905,6 +906,12 @@
       "query it defaults to.  Use with care- note additionally this setting "
       "only has an effect if the buildbot target is a cq target, and we're "
       "in buildbot mode.")
+  group.add_remote_option('--latest-toolchain', action='store_true',
+                          default=False,
+                          help='Use the latest toolchain.')
+  group.add_remote_option('--no-sdk', action='store_true',
+                          default=False,
+                          help='Re-create the SDK from scratch.')
 
   parser.add_option_group(group)
 
@@ -1127,6 +1134,9 @@
 
 
 def main(argv):
+  # Turn on strict sudo checks.
+  cros_build_lib.STRICT_SUDO = True
+
   # Set umask to 022 so files created by buildbot are readable.
   os.umask(022)