cbuildbot_run: Make site_config available to all build stages.
Nobody uses this new value yet, but this CL makes the site config
available to all build stages. This is prep for getting rid of the
cbuildbot_config global access.
Follow on changes will remove references in various stages by using
the new shared site_config value instead.
BUG=chromium:483566
TEST=run_tests + lint
Change-Id: I54532bdc5456cdbcc7eefa99e248a646bc5a23a9
Reviewed-on: https://chromium-review.googlesource.com/274871
Trybot-Ready: Don Garrett <dgarrett@chromium.org>
Reviewed-by: David James <davidjames@chromium.org>
Commit-Queue: Don Garrett <dgarrett@chromium.org>
Tested-by: Don Garrett <dgarrett@chromium.org>
diff --git a/scripts/cbuildbot.py b/scripts/cbuildbot.py
index 8f39232..47f201b 100644
--- a/scripts/cbuildbot.py
+++ b/scripts/cbuildbot.py
@@ -179,7 +179,7 @@
return False
-def _RunBuildStagesWrapper(options, build_config):
+def _RunBuildStagesWrapper(options, site_config, build_config):
"""Helper function that wraps RunBuildStages()."""
logging.info('cbuildbot was executed with args %s' %
cros_build_lib.CmdToStr(sys.argv))
@@ -223,7 +223,8 @@
options.Freeze()
with parallel.Manager() as manager:
- builder_run = cbuildbot_run.BuilderRun(options, build_config, manager)
+ builder_run = cbuildbot_run.BuilderRun(
+ options, site_config, build_config, manager)
if metadata_dump_dict:
builder_run.attrs.metadata.UpdateWithDict(metadata_dump_dict)
@@ -1229,4 +1230,4 @@
if options.timeout > 0:
stack.Add(timeout_util.FatalTimeout, options.timeout)
- _RunBuildStagesWrapper(options, build_config)
+ _RunBuildStagesWrapper(options, site_config, build_config)