diff options
| author | Don Garrett <dgarrett@google.com> | 2015-06-03 13:12:29 -0700 |
|---|---|---|
| committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-06-04 01:15:48 +0000 |
| commit | fb368b1012017724da61d4ba290e9dcec16fa023 (patch) | |
| tree | 0109c0fe0d0312278ac9d3a8ca982b7d28781213 /scripts | |
| parent | b22c0716ea7cbd986ef691a71636514c53b7741d (diff) | |
| download | chromite-fb368b1012017724da61d4ba290e9dcec16fa023.tar.gz | |
generate_chromeos_config -> chromeos_config.
I originally named the module generate_chromeos_config because I
intended to only use it for generate the chromeos specific
configuration Json file.
However, we are using it for some Chrome OS specific scripts, and
won't be able to generalize them for a long time. So... rename the
module to reflect how it's being used.
BUG=None
TEST=cbuildbot/run_tests
Change-Id: I8b111c06c48181a43e01c6d494a8a493a0371718
Reviewed-on: https://chromium-review.googlesource.com/275026
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/cbuildbot.py | 6 | ||||
| -rw-r--r-- | scripts/cbuildbot_view_config.py | 4 | ||||
| -rw-r--r-- | scripts/cros_show_waterfall_layout.py | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py index 46c6c40f3..56ffd77ef 100644 --- a/scripts/cbuildbot.py +++ b/scripts/cbuildbot.py @@ -23,7 +23,7 @@ from chromite.cbuildbot import builders from chromite.cbuildbot import cbuildbot_run from chromite.cbuildbot import config_lib from chromite.cbuildbot import constants -from chromite.cbuildbot import generate_chromeos_config +from chromite.cbuildbot import chromeos_config from chromite.cbuildbot import manifest_version from chromite.cbuildbot import remote_try from chromite.cbuildbot import repository @@ -1029,7 +1029,7 @@ def main(argv): # The location of the SiteConfig is still hardcoded in a Chrome OS specific # way... for now. site_config = config_lib.CreateConfigFromFile( - generate_chromeos_config.CONFIG_FILE) + chromeos_config.CONFIG_FILE) # Turn on strict sudo checks. cros_build_lib.STRICT_SUDO = True @@ -1183,7 +1183,7 @@ def main(argv): stack.Add(critical_section.ForkWatchdog) if not options.buildbot: - build_config = generate_chromeos_config.OverrideConfigForTrybot( + build_config = chromeos_config.OverrideConfigForTrybot( build_config, options) if options.mock_tree_status is not None: diff --git a/scripts/cbuildbot_view_config.py b/scripts/cbuildbot_view_config.py index 4ca55b0b5..ec813c0c6 100644 --- a/scripts/cbuildbot_view_config.py +++ b/scripts/cbuildbot_view_config.py @@ -6,9 +6,9 @@ from __future__ import print_function -from chromite.cbuildbot import generate_chromeos_config +from chromite.cbuildbot import chromeos_config def main(_argv): - config = generate_chromeos_config.GetConfig() + config = chromeos_config.GetConfig() print(config.SaveConfigToString()) diff --git a/scripts/cros_show_waterfall_layout.py b/scripts/cros_show_waterfall_layout.py index cc54ea6e3..07c78aff0 100644 --- a/scripts/cros_show_waterfall_layout.py +++ b/scripts/cros_show_waterfall_layout.py @@ -9,7 +9,7 @@ from __future__ import print_function import json import sys -from chromite.cbuildbot import generate_chromeos_config +from chromite.cbuildbot import chromeos_config from chromite.lib import commandline @@ -62,7 +62,7 @@ def main(argv): opts = _ParseArguments(argv) layout = {} - for config_name, config in generate_chromeos_config.GetConfig().iteritems(): + for config_name, config in chromeos_config.GetConfig().iteritems(): active_waterfall = config['active_waterfall'] if not active_waterfall: continue |