commit 6747ebab7065bd4071670ba5eb21ca9a7d30cb0e
author Don Garrett <dgarrett@google.com> Thu Jun 25 16:00:16 2015 -0700
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Tue Jun 30 12:21:59 2015 +0000
tree fe81a403a0aef807fd5e033d70156b797630c63c
parent d2e0884532d9e314fc556b8696a10097febee451

config_lib: Move OverrideConfigForTrybot to config_lib.

This Override method is now site independent. Signify this by moving
it to config_lib.

Also create some site independent unittests for it.

CQ-DEPEND=CL:282072
BUG=chromium:457439
TEST=lint + run_tests

Change-Id: Ifa66fac798fb991397324a40e712e0a2d8b68044
Reviewed-on: https://chromium-review.googlesource.com/282053
Reviewed-by: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>

scripts/cbuildbot.py

diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 243aece..1a0a063 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -23,7 +23,6 @@
 from chromite.cbuildbot import cbuildbot_run
 from chromite.cbuildbot import config_lib
 from chromite.cbuildbot import constants
-from chromite.cbuildbot import chromeos_config
 from chromite.cbuildbot import manifest_version
 from chromite.cbuildbot import remote_try
 from chromite.cbuildbot import repository
@@ -1187,7 +1186,7 @@
     stack.Add(critical_section.ForkWatchdog)
 
     if not options.buildbot:
-      build_config = chromeos_config.OverrideConfigForTrybot(
+      build_config = config_lib.OverrideConfigForTrybot(
           build_config, options)
 
     if options.mock_tree_status is not None: