mirror of
https://chromium.googlesource.com/crosvm/crosvm
synced 2025-02-10 04:07:23 +00:00
Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls recipe changes from upstream projects (depot_tools, recipe_engine) into this repository. The build that created this CL was https://ci.chromium.org/b/8807654577509529489 depot_tools:9585c93796~..647cfe6bf10efa3e171bed867a455347567007c7 9585c93 (chanli@chromium.org) roll dirmd 164952a (qyearsley@chromium.org) Revert "Update lucicfg from version 1.31.5 to 1.31.6" 904ca29 (chanli@chromium.org) [depot_tools] roll led f3edc50 (jojwang@chromium.org) [no-sync] Store previous sync commit in memory. 7298625 (tikuta@chromium.org) recipes: use python3 for git_footers.py 16d08f0 (tperrotta@chromium.org) git-cl: parse baseurl arguments eagerly 0ba2fd4 (brucedawson@chromium.org) Get full paths in presubmit traceback stacks fcb6206 (tperrotta@chromium.org) Add a fetch config for chrome (internal). debf640 (tperrotta@chromium.org) Add a fetch config for devtools (internal). 36bf3a8 (tperrotta@chromium.org) yapf: remove unused `re` import 77da3f2 (jojwang@chromium.org) Fix flaky testRecursedepsCustomdepsOverride. 647cfe6 (vapier@chromium.org) pylint: drop unversioned program recipe_engine:0ade4d7c8f~..8f92d0c510bcddd3c369a14d222ecc18d7c63783 0ade4d7 (chromium-autoroll@skia-public.iam.gserviceaccount.com) Roll CAS Client from 46e5b6417320 to 9fbd373abf97 a53cb2c (iannucci@chromium.org) [manual_roll] Allow manual_roll to work even when protoc breaks. e57338e (iannucci@chromium.org) [luciexe] Update engine to emit build streams with MergeBuild. 65f334b (iannucci@chromium.org) [legacy_annotation] Allow recipes to specify legacy mode. 5226416 (iannucci@chromium.org) [legacy_annotations] Only merge properties if legacy_global_nam... 8f92d0c (iannucci@chromium.org) [python3] Allow repos to be python3-only. Please check the following references for more information: - autoroller, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#autoroller - rollback, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/workflow.md#rollback - cross-repo dependencies, https://chromium.googlesource.com/infra/luci/recipes-py/+/main/doc/cross_repo.md Use https://goo.gl/noib3a to file a bug. R=denniskempin@google.com Recipe-Tryjob-Bypass-Reason: Autoroller Ignore-Freeze: Autoroller Bugdroid-Send-Email: False Change-Id: I937ed8fad6dfc4574d4f876f659465d16257d824 Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/3784097 Bot-Commit: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com> Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
This commit is contained in:
recipe-roller
crosvm LUCI
parent
c3c9a30f42
commit
15e1e977d2
3 changed files with 39 additions and 30 deletions
|
|
@ -178,18 +178,18 @@ PYTHON_VERSION_COMPATIBILITY: PY3
|
|||
|
||||
— **def [RunSteps](/infra/recipes/update_chromeos_merges.py#16)(api):**
|
||||
|
||||
[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/90191b14c2be0a5344c2379681ce5c0460434e23/recipes/README.recipes.md#recipe_modules-bot_update
|
||||
[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/90191b14c2be0a5344c2379681ce5c0460434e23/recipes/README.recipes.md#recipe_modules-depot_tools
|
||||
[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/90191b14c2be0a5344c2379681ce5c0460434e23/recipes/README.recipes.md#recipe_modules-gclient
|
||||
[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/90191b14c2be0a5344c2379681ce5c0460434e23/recipes/README.recipes.md#recipe_modules-git
|
||||
[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/90191b14c2be0a5344c2379681ce5c0460434e23/recipes/README.recipes.md#recipe_modules-gsutil
|
||||
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-buildbucket
|
||||
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-cipd
|
||||
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-context
|
||||
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-file
|
||||
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-path
|
||||
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-platform
|
||||
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-properties
|
||||
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-raw_io
|
||||
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/README.recipes.md#recipe_modules-step
|
||||
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/428eeaebf2e1de58ed1c7cae50daba3384d730cd/recipe_engine/recipe_api.py#886
|
||||
[depot_tools/recipe_modules/bot_update]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/647cfe6bf10efa3e171bed867a455347567007c7/recipes/README.recipes.md#recipe_modules-bot_update
|
||||
[depot_tools/recipe_modules/depot_tools]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/647cfe6bf10efa3e171bed867a455347567007c7/recipes/README.recipes.md#recipe_modules-depot_tools
|
||||
[depot_tools/recipe_modules/gclient]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/647cfe6bf10efa3e171bed867a455347567007c7/recipes/README.recipes.md#recipe_modules-gclient
|
||||
[depot_tools/recipe_modules/git]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/647cfe6bf10efa3e171bed867a455347567007c7/recipes/README.recipes.md#recipe_modules-git
|
||||
[depot_tools/recipe_modules/gsutil]: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+/647cfe6bf10efa3e171bed867a455347567007c7/recipes/README.recipes.md#recipe_modules-gsutil
|
||||
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-buildbucket
|
||||
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-cipd
|
||||
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-context
|
||||
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-file
|
||||
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-path
|
||||
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-platform
|
||||
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-properties
|
||||
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-raw_io
|
||||
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/README.recipes.md#recipe_modules-step
|
||||
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/8f92d0c510bcddd3c369a14d222ecc18d7c63783/recipe_engine/recipe_api.py#886
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@
|
|||
"deps": {
|
||||
"depot_tools": {
|
||||
"branch": "refs/heads/main",
|
||||
"revision": "90191b14c2be0a5344c2379681ce5c0460434e23",
|
||||
"revision": "647cfe6bf10efa3e171bed867a455347567007c7",
|
||||
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
|
||||
},
|
||||
"recipe_engine": {
|
||||
"branch": "refs/heads/main",
|
||||
"revision": "428eeaebf2e1de58ed1c7cae50daba3384d730cd",
|
||||
"revision": "8f92d0c510bcddd3c369a14d222ecc18d7c63783",
|
||||
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -70,9 +70,12 @@ def parse(repo_root, recipes_cfg_path):
|
|||
recipes_path (str) - native path to where the recipes live inside of the
|
||||
current repo (i.e. the folder containing `recipes/` and/or
|
||||
`recipe_modules`)
|
||||
py3_only (bool) - True if this repo has been marked as ONLY supporting
|
||||
python3.
|
||||
"""
|
||||
with open(recipes_cfg_path, 'r') as fh:
|
||||
pb = json.load(fh)
|
||||
py3_only = pb.get('py3_only', False)
|
||||
|
||||
try:
|
||||
if pb['api_version'] != 2:
|
||||
|
|
@ -85,7 +88,7 @@ def parse(repo_root, recipes_cfg_path):
|
|||
if not repo_name:
|
||||
repo_name = pb['project_id']
|
||||
if repo_name == 'recipe_engine':
|
||||
return None, pb.get('recipes_path', '')
|
||||
return None, pb.get('recipes_path', ''), py3_only
|
||||
|
||||
engine = pb['deps']['recipe_engine']
|
||||
|
||||
|
|
@ -104,7 +107,7 @@ def parse(repo_root, recipes_cfg_path):
|
|||
|
||||
recipes_path = os.path.join(repo_root,
|
||||
recipes_path.replace('/', os.path.sep))
|
||||
return EngineDep(**engine), recipes_path
|
||||
return EngineDep(**engine), recipes_path, py3_only
|
||||
except KeyError as ex:
|
||||
raise MalformedRecipesCfg(str(ex), recipes_cfg_path)
|
||||
|
||||
|
|
@ -113,11 +116,8 @@ IS_WIN = sys.platform.startswith(('win', 'cygwin'))
|
|||
|
||||
_BAT = '.bat' if IS_WIN else ''
|
||||
GIT = 'git' + _BAT
|
||||
VPYTHON = ('vpython' +
|
||||
('3' if os.getenv('RECIPES_USE_PY3') == 'true' else '') +
|
||||
_BAT)
|
||||
CIPD = 'cipd' + _BAT
|
||||
REQUIRED_BINARIES = {GIT, VPYTHON, CIPD}
|
||||
REQUIRED_BINARIES = {GIT, CIPD}
|
||||
|
||||
|
||||
def _is_executable(path):
|
||||
|
|
@ -169,10 +169,14 @@ def parse_args(argv):
|
|||
|
||||
|
||||
def checkout_engine(engine_path, repo_root, recipes_cfg_path):
|
||||
dep, recipes_path = parse(repo_root, recipes_cfg_path)
|
||||
"""Checks out the recipe_engine repo pinned in recipes.cfg.
|
||||
|
||||
Returns the path to the recipe engine repo and the py3_only boolean.
|
||||
"""
|
||||
dep, recipes_path, py3_only = parse(repo_root, recipes_cfg_path)
|
||||
if dep is None:
|
||||
# we're running from the engine repo already!
|
||||
return os.path.join(repo_root, recipes_path)
|
||||
return os.path.join(repo_root, recipes_path), py3_only
|
||||
|
||||
url = dep.url
|
||||
|
||||
|
|
@ -217,7 +221,7 @@ def checkout_engine(engine_path, repo_root, recipes_cfg_path):
|
|||
# or things will get squirrely.
|
||||
_git_check_call(['clean', '-qxf'], cwd=engine_path)
|
||||
|
||||
return engine_path
|
||||
return engine_path, py3_only
|
||||
|
||||
|
||||
def main():
|
||||
|
|
@ -243,11 +247,16 @@ def main():
|
|||
repo_root = os.path.abspath(repo_root).decode()
|
||||
recipes_cfg_path = os.path.join(repo_root, 'infra', 'config', 'recipes.cfg')
|
||||
args = ['--package', recipes_cfg_path] + args
|
||||
engine_path = checkout_engine(engine_override, repo_root, recipes_cfg_path)
|
||||
engine_path, py3_only = checkout_engine(engine_override, repo_root, recipes_cfg_path)
|
||||
|
||||
argv = (
|
||||
[VPYTHON, '-u',
|
||||
os.path.join(engine_path, 'recipe_engine', 'main.py')] + args)
|
||||
using_py3 = py3_only or os.getenv('RECIPES_USE_PY3') == 'true'
|
||||
vpython = ('vpython' + ('3' if using_py3 else '') + _BAT)
|
||||
if not _is_on_path(vpython):
|
||||
return 'Required binary is not found on PATH: %s' % vpython
|
||||
|
||||
argv = ([
|
||||
vpython, '-u', os.path.join(engine_path, 'recipe_engine', 'main.py'),
|
||||
] + args)
|
||||
|
||||
if IS_WIN:
|
||||
# No real 'exec' on windows; set these signals to ignore so that they
|
||||
|
|
|
|||
Loading…
Reference in a new issue