[Autotest][COIL] updates to utils/*
Removing non-inclusive terms. some TODO from git (master)
BUG=b:169251128
TEST=None
Change-Id: I030bbf43d1e1536e688a270e717f90ae08bddab1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/2601722
Tested-by: Derek Beckett <[email protected]>
Reviewed-by: Mike Frysinger <[email protected]>
Commit-Queue: Derek Beckett <[email protected]>
diff --git a/utils/build_externals.py b/utils/build_externals.py
index 9e76ef6..79c2ce2 100755
--- a/utils/build_externals.py
+++ b/utils/build_externals.py
@@ -78,7 +78,7 @@
fetched_packages, fetch_errors = fetch_necessary_packages(
package_dir, install_dir, set(options.names_to_check))
install_errors = build_and_install_packages(fetched_packages, install_dir,
- options.use_chromite_master)
+ options.use_chromite_main)
# Byte compile the code after it has been installed in its final
# location as .pyc files contain the path passed to compile_dir().
@@ -113,8 +113,8 @@
parser = argparse.ArgumentParser(
description='Command to build third party dependencies required '
'for autotest.')
- parser.add_argument('--use_chromite_master', action='store_true',
- help='Update chromite to master branch, rather than '
+ parser.add_argument('--use_chromite_main', action='store_true',
+ help='Update chromite to main branch, rather than '
'prod.')
parser.add_argument('--names_to_check', nargs='*', type=str, default=set(),
help='Package names to check whether they are needed '
@@ -160,13 +160,13 @@
def build_and_install_packages(packages, install_dir,
- use_chromite_master=True):
+ use_chromite_main=True):
"""
Builds and installs all packages into install_dir.
@param packages - A list of already fetched ExternalPackage instances.
@param install_dir - Directory the packages should be installed into.
- @param use_chromite_master: True if updating chromite to master branch. Due
+ @param use_chromite_main: True if updating chromite to main branch. Due
to the non-usage of origin/prod tag, the default
value for this argument has been set to True.
This argument has not been removed for backward
@@ -177,14 +177,14 @@
errors = []
for package in packages:
if package.name.lower() == 'chromiterepo':
- if not use_chromite_master:
+ if not use_chromite_main:
logging.warning(
- 'Even though use_chromite_master has been set to %s, it '
- 'will be checked out to master as the origin/prod tag '
- 'carries little value now.', use_chromite_master)
- logging.info('Checking out autotest-chromite to master branch.')
+ 'Even though use_chromite_main has been set to %s, it '
+ 'will be checked out to main as the origin/prod tag '
+ 'carries little value now.', use_chromite_main)
+ logging.info('Checking out autotest-chromite to main branch.')
result = package.build_and_install(
- install_dir, master_branch=True)
+ install_dir, main_branch=True)
else:
result = package.build_and_install(install_dir)
if isinstance(result, bool):
