Skip to content

C
Chromium_Depot_tools
Commit efc7e91f authored by Robert Iannucci's avatar Robert Iannucci Committed by Commit Bot
Browse files
Options

[recipes] Manual roll. 

Update "import DEPS" syntax and package_repo_resource.

recipe_engine:
  https://crrev.com/a42dce4e0b0db8bd6b7688030e723197919306db [engine] Rewrite/simplify loading infrastructure. (iannucci@chromium.org)

R=jchinlee@chromium.org, martiniss@chromium.org, tandrii@chromium.org

Recipe-Manual-Change: skia
Recipe-Manual-Change: skiabuildbot
Recipe-Manual-Change: build
Recipe-Manual-Change: build_limited_scripts_slave
Recipe-Manual-Change: infra
Recipe-Manual-Change: release_scripts
Bug: 914992
Change-Id: Ie3a3be9124e1ca4abd5e79af2f8c946b3ce906ff
Reviewed-on: https://chromium-review.googlesource.com/c/1464761
Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
Reviewed-by: 's avatarStephen Martinis <martiniss@chromium.org>
Reviewed-by: 's avatarAndrii Shyshkalov <tandrii@chromium.org>
parent 2b14855d
Hide whitespace changes
Inline Side-by-side
Showing with 315 additions and 313 deletions
infra/config/recipes.cfg
View file @ efc7e91f
......@@ -15,7 +15,7 @@
"deps": {
"recipe_engine": {
"branch": "master",
"revision": "feac5f657c68d422c5209da0b47e5f5e74cbeac4",
"revision": "a42dce4e0b0db8bd6b7688030e723197919306db",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
......
recipes/README.recipes.md
View file @ efc7e91f
<!--- AUTOGENERATED BY `./recipes.py test train` -->
# Package documentation for [depot\_tools](https://chromium.googlesource.com/chromium/tools/depot_tools.git)
# Repo documentation for [depot\_tools](https://chromium.googlesource.com/chromium/tools/depot_tools.git)
## Table of Contents
**[Recipe Modules](#Recipe-Modules)**
......@@ -975,18 +975,18 @@ Move things around in a loop!
&mdash; **def [RunSteps](/recipes/recipe_modules/windows_sdk/examples/full.py#13)(api):**
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-source_manifest
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/README.recipes.md#recipe_modules-url
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/feac5f657c68d422c5209da0b47e5f5e74cbeac4/recipe_engine/recipe_api.py#1005
[recipe_engine/recipe_modules/buildbucket]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-buildbucket
[recipe_engine/recipe_modules/cipd]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-cipd
[recipe_engine/recipe_modules/context]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-context
[recipe_engine/recipe_modules/file]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-file
[recipe_engine/recipe_modules/json]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-json
[recipe_engine/recipe_modules/path]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-path
[recipe_engine/recipe_modules/platform]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-platform
[recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-properties
[recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-python
[recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-raw_io
[recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-runtime
[recipe_engine/recipe_modules/source_manifest]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-source_manifest
[recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-step
[recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/README.recipes.md#recipe_modules-url
[recipe_engine/wkt/RecipeApi]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/a42dce4e0b0db8bd6b7688030e723197919306db/recipe_engine/recipe_api.py#1005
recipes/recipe_modules/bot_update/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -20,7 +20,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json
View file @ efc7e91f
......@@ -20,7 +20,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
View file @ efc7e91f
......@@ -21,7 +21,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
View file @ efc7e91f
......@@ -21,7 +21,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -116,7 +116,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -63,7 +63,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -128,7 +128,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
View file @ efc7e91f
......@@ -21,7 +21,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -116,7 +116,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
View file @ efc7e91f
......@@ -21,7 +21,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -116,7 +116,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json
View file @ efc7e91f
......@@ -20,7 +20,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -115,7 +115,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json
View file @ efc7e91f
......@@ -24,7 +24,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -119,7 +119,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -165,7 +165,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/refs.json
View file @ efc7e91f
......@@ -22,7 +22,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -117,7 +117,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
View file @ efc7e91f
......@@ -20,7 +20,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -115,7 +115,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -63,7 +63,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -63,7 +63,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -63,7 +63,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -165,7 +165,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -162,7 +162,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -63,7 +63,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -160,7 +160,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -165,7 +165,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://webrtc-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -165,7 +165,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -165,7 +165,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -65,7 +65,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -165,7 +165,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json
View file @ efc7e91f
......@@ -20,7 +20,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
View file @ efc7e91f
......@@ -21,7 +21,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -116,7 +116,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
recipes/recipe_modules/depot_tools/api.py
View file @ efc7e91f
......@@ -12,44 +12,44 @@ from recipe_engine import recipe_api
class DepotToolsApi(recipe_api.RecipeApi):
@property
def download_from_google_storage_path(self):
return self.package_repo_resource('download_from_google_storage.py')
return self.repo_resource('download_from_google_storage.py')
@property
def upload_to_google_storage_path(self):
return self.package_repo_resource('upload_to_google_storage.py')
return self.repo_resource('upload_to_google_storage.py')
@property
def root(self):
"""Returns (Path): The "depot_tools" root directory."""
return self.package_repo_resource()
return self.repo_resource()
@property
def cros_path(self):
return self.package_repo_resource('cros')
return self.repo_resource('cros')
@property
def gn_py_path(self):
return self.package_repo_resource('gn.py')
return self.repo_resource('gn.py')
# TODO(dnj): Remove this once everything uses the "gsutil" recipe module
# version.
@property
def gsutil_py_path(self):
return self.package_repo_resource('gsutil.py')
return self.repo_resource('gsutil.py')
@property
def ninja_path(self):
ninja_exe = 'ninja.exe' if self.m.platform.is_win else 'ninja'
return self.package_repo_resource(ninja_exe)
return self.repo_resource(ninja_exe)
@property
def autoninja_path(self):
autoninja = 'autoninja.bat' if self.m.platform.is_win else 'autoninja'
return self.package_repo_resource(autoninja)
return self.repo_resource(autoninja)
@property
def presubmit_support_py_path(self):
return self.package_repo_resource('presubmit_support.py')
return self.repo_resource('presubmit_support.py')
@contextlib.contextmanager
def on_path(self):
......
recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -2,63 +2,63 @@
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
],
"name": "root"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/download_from_google_storage.py"
"RECIPE_REPO[depot_tools]/download_from_google_storage.py"
],
"name": "download_from_google_storage"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/upload_to_google_storage.py"
"RECIPE_REPO[depot_tools]/upload_to_google_storage.py"
],
"name": "upload_to_google_storage"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/cros"
"RECIPE_REPO[depot_tools]/cros"
],
"name": "cros"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/gn.py"
"RECIPE_REPO[depot_tools]/gn.py"
],
"name": "gn_py_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py"
"RECIPE_REPO[depot_tools]/gsutil.py"
],
"name": "gsutil_py_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/ninja"
"RECIPE_REPO[depot_tools]/ninja"
],
"name": "ninja_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/autoninja"
"RECIPE_REPO[depot_tools]/autoninja"
],
"name": "autoninja_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/presubmit_support.py"
"RECIPE_REPO[depot_tools]/presubmit_support.py"
],
"name": "presubmit_support_py_path"
},
......@@ -69,7 +69,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "on_path"
......
recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json
View file @ efc7e91f
......@@ -2,63 +2,63 @@
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
],
"name": "root"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/download_from_google_storage.py"
"RECIPE_REPO[depot_tools]/download_from_google_storage.py"
],
"name": "download_from_google_storage"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/upload_to_google_storage.py"
"RECIPE_REPO[depot_tools]/upload_to_google_storage.py"
],
"name": "upload_to_google_storage"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/cros"
"RECIPE_REPO[depot_tools]/cros"
],
"name": "cros"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/gn.py"
"RECIPE_REPO[depot_tools]/gn.py"
],
"name": "gn_py_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py"
"RECIPE_REPO[depot_tools]/gsutil.py"
],
"name": "gsutil_py_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/ninja"
"RECIPE_REPO[depot_tools]/ninja"
],
"name": "ninja_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/autoninja"
"RECIPE_REPO[depot_tools]/autoninja"
],
"name": "autoninja_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]/presubmit_support.py"
"RECIPE_REPO[depot_tools]/presubmit_support.py"
],
"name": "presubmit_support_py_path"
},
......@@ -69,7 +69,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "on_path"
......
recipes/recipe_modules/depot_tools/examples/full.expected/win.json
View file @ efc7e91f
......@@ -2,63 +2,63 @@
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
],
"name": "root"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\download_from_google_storage.py"
"RECIPE_REPO[depot_tools]\\download_from_google_storage.py"
],
"name": "download_from_google_storage"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\upload_to_google_storage.py"
"RECIPE_REPO[depot_tools]\\upload_to_google_storage.py"
],
"name": "upload_to_google_storage"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\cros"
"RECIPE_REPO[depot_tools]\\cros"
],
"name": "cros"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\gn.py"
"RECIPE_REPO[depot_tools]\\gn.py"
],
"name": "gn_py_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\gsutil.py"
"RECIPE_REPO[depot_tools]\\gsutil.py"
],
"name": "gsutil_py_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\ninja.exe"
"RECIPE_REPO[depot_tools]\\ninja.exe"
],
"name": "ninja_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\autoninja.bat"
"RECIPE_REPO[depot_tools]\\autoninja.bat"
],
"name": "autoninja_path"
},
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]\\presubmit_support.py"
"RECIPE_REPO[depot_tools]\\presubmit_support.py"
],
"name": "presubmit_support_py_path"
},
......@@ -69,7 +69,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "on_path"
......
recipes/recipe_modules/gclient/api.py
View file @ efc7e91f
......@@ -80,9 +80,9 @@ class GclientApi(recipe_api.RecipeApi):
prefix = ('[spec: %s] ' % self.spec_alias) + prefix
with self.m.context(
env_suffixes={'PATH': [self._module.PACKAGE_REPO_ROOT]}):
env_suffixes={'PATH': [self.repo_resource()]}):
return self.m.python(prefix + name,
self.package_repo_resource('gclient.py'),
self.repo_resource('gclient.py'),
cmd,
infra_step=infra_step,
**kwargs)
......
recipes/recipe_modules/gclient/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -3,14 +3,14 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -20,7 +20,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -37,7 +37,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -57,7 +57,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -66,7 +66,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -76,7 +76,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -85,7 +85,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -95,7 +95,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
......@@ -103,7 +103,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -113,7 +113,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -133,7 +133,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -157,7 +157,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -167,7 +167,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -177,7 +177,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -187,7 +187,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -221,13 +221,13 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[START_DIR]/src",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
......
recipes/recipe_modules/gclient/examples/full.expected/buildbot.json
View file @ efc7e91f
......@@ -3,14 +3,14 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -20,7 +20,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -37,7 +37,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -57,7 +57,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -66,7 +66,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -76,7 +76,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -85,7 +85,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -95,7 +95,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
......@@ -103,7 +103,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -113,7 +113,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -133,7 +133,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -157,7 +157,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -167,7 +167,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -177,7 +177,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -187,7 +187,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -221,13 +221,13 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[START_DIR]/src",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
......
recipes/recipe_modules/gclient/examples/full.expected/revision.json
View file @ efc7e91f
......@@ -3,14 +3,14 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -20,7 +20,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -39,7 +39,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -59,7 +59,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -68,7 +68,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -78,7 +78,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -87,7 +87,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -97,7 +97,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
......@@ -105,7 +105,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -115,7 +115,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -137,7 +137,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -161,7 +161,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -171,7 +171,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -181,7 +181,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -191,7 +191,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -225,13 +225,13 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[START_DIR]/src",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
......
recipes/recipe_modules/gclient/examples/full.expected/tryserver.json
View file @ efc7e91f
......@@ -3,14 +3,14 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[ROOT]/git_cache'\nsolutions = [{'custom_vars': {'string_var': 'string_val', 'true_var': True}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]"
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -20,7 +20,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -37,7 +37,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -57,7 +57,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -66,7 +66,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -76,7 +76,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -85,7 +85,7 @@
],
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -95,7 +95,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
"cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
......@@ -103,7 +103,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -113,7 +113,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"sync",
"--verbose",
"--nohooks",
......@@ -133,7 +133,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -157,7 +157,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -167,7 +167,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -177,7 +177,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"recurse",
"git",
"config",
......@@ -187,7 +187,7 @@
"cwd": "[START_DIR]/src/third_party",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......@@ -221,13 +221,13 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"RECIPE_REPO[depot_tools]/gclient.py",
"runhooks"
],
"cwd": "[START_DIR]/src",
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
......
recipes/recipe_modules/gerrit/api.py
View file @ efc7e91f
......@@ -19,11 +19,11 @@ class GerritApi(recipe_api.RecipeApi):
env = self.m.context.env
env.setdefault('PATH', '%(PATH)s')
env['PATH'] = self.m.path.pathsep.join([
env['PATH'], str(self._module.PACKAGE_REPO_ROOT)])
env['PATH'], str(self.repo_resource())])
with self.m.context(env=env):
return self.m.python(prefix + name,
self.package_repo_resource('gerrit_client.py'),
self.repo_resource('gerrit_client.py'),
cmd,
infra_step=infra_step,
**kwargs)
......
recipes/recipe_modules/gerrit/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"branch",
"--host",
"https://chromium-review.googlesource.com",
......@@ -17,7 +17,7 @@
"/path/to/tmp/json"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit create_gerrit_branch (v8/v8 test)",
......@@ -34,7 +34,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"branchinfo",
"--host",
"https://chromium-review.googlesource.com",
......@@ -46,7 +46,7 @@
"/path/to/tmp/json"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit get_gerrit_branch (v8/v8 master)",
......@@ -62,7 +62,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -80,7 +80,7 @@
"label=Commit-Queue>0"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit changes",
......@@ -112,7 +112,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -126,7 +126,7 @@
"label=Commit-Queue>2"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit changes empty query",
......@@ -139,7 +139,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -155,7 +155,7 @@
"ALL_COMMITS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit changes (2)",
......@@ -187,7 +187,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -203,7 +203,7 @@
"ALL_COMMITS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit changes (3)",
......
recipes/recipe_modules/git/api.py
View file @ efc7e91f
......@@ -194,7 +194,7 @@ class GitApi(recipe_api.RecipeApi):
# Some of the commands below require depot_tools to be in PATH.
path = self.m.path.pathsep.join([
str(self.package_repo_resource()), '%(PATH)s'])
str(self.repo_resource()), '%(PATH)s'])
with self.m.context(cwd=dir_path):
if use_git_cache:
......@@ -403,7 +403,7 @@ class GitApi(recipe_api.RecipeApi):
"""
env = self.m.context.env
env['PATH'] = self.m.path.pathsep.join([
str(self.package_repo_resource()), '%(PATH)s'])
str(self.repo_resource()), '%(PATH)s'])
args = ['new-branch', branch]
if upstream:
args.extend(['--upstream', upstream])
......
recipes/recipe_modules/git/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -174,7 +174,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -189,7 +189,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_branch.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -174,7 +174,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -189,7 +189,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_file_name.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -176,7 +176,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -191,7 +191,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_hash.json
View file @ efc7e91f
......@@ -22,7 +22,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -173,7 +173,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -188,7 +188,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_luci.json
View file @ efc7e91f
......@@ -22,7 +22,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -173,7 +173,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -188,7 +188,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_ref.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -174,7 +174,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -189,7 +189,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -175,7 +175,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -190,7 +190,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/basic_tags.json
View file @ efc7e91f
......@@ -24,7 +24,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -175,7 +175,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -190,7 +190,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......
recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -178,7 +178,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -193,7 +193,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/cat-file_test.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -174,7 +174,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -189,7 +189,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json
View file @ efc7e91f
......@@ -45,7 +45,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -249,7 +249,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -264,7 +264,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -178,7 +178,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -193,7 +193,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -179,7 +179,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -194,7 +194,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......
recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json
View file @ efc7e91f
......@@ -24,7 +24,7 @@
"cwd": "[START_DIR]/src",
"env": {
"GIT_CURL_VERBOSE": "1",
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch",
......@@ -176,7 +176,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -191,7 +191,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "populate cache"
......@@ -40,7 +40,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git cache",
......@@ -56,7 +56,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git remote"
......@@ -73,7 +73,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -224,7 +224,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -239,7 +239,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/platform_win.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]\\src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];<PATH>"
"PATH": "RECIPE_REPO[depot_tools];<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -174,7 +174,7 @@
],
"cwd": "[START_DIR]\\src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];<PATH>"
"PATH": "RECIPE_REPO[depot_tools];<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -189,7 +189,7 @@
],
"cwd": "[START_DIR]\\src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools];<PATH>"
"PATH": "RECIPE_REPO[depot_tools];<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -174,7 +174,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -189,7 +189,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json
View file @ efc7e91f
......@@ -25,7 +25,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -176,7 +176,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -191,7 +191,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git/examples/full.expected/set_got_revision.json
View file @ efc7e91f
......@@ -23,7 +23,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git fetch"
......@@ -175,7 +175,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch refactor"
......@@ -190,7 +190,7 @@
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "RECIPE_PACKAGE_REPO[depot_tools]:<PATH>"
"PATH": "RECIPE_REPO[depot_tools]:<PATH>"
},
"infra_step": true,
"name": "git new-branch feature"
......
recipes/recipe_modules/git_cl/api.py
View file @ efc7e91f
......@@ -17,7 +17,7 @@ class GitClApi(recipe_api.RecipeApi):
my_loc = self.c.repo_location if self.c else None
with self.m.context(cwd=self.m.context.cwd or my_loc):
return self.m.step(
name, [self.package_repo_resource('git_cl.py'), subcmd] + args,
name, [self.repo_resource('git_cl.py'), subcmd] + args,
**kwargs)
def get_description(self, patch_url=None, codereview=None, **kwargs):
......
recipes/recipe_modules/git_cl/examples/full.expected/basic.json
View file @ efc7e91f
[
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"upload",
"--message-file",
"Do the thing foobar\nNow with emoji: \ud83d\ude04"
......@@ -10,7 +10,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"issue"
],
"name": "git_cl issue",
......@@ -18,7 +18,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
"-d",
"--rietveld",
......@@ -29,7 +29,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
"-n",
"-",
......@@ -49,7 +49,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
"-d"
],
......@@ -66,7 +66,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
"-n",
"-"
......@@ -78,7 +78,7 @@
},
{
"cmd": [
"RECIPE_PACKAGE_REPO[depot_tools]/git_cl.py",
"RECIPE_REPO[depot_tools]/git_cl.py",
"description",
"-d"
],
......
recipes/recipe_modules/gsutil/api.py
View file @ efc7e91f
......@@ -9,7 +9,7 @@ from recipe_engine import recipe_api
class GSUtilApi(recipe_api.RecipeApi):
@property
def gsutil_py_path(self):
return self.package_repo_resource('gsutil.py')
return self.repo_resource('gsutil.py')
def __call__(self, cmd, name=None, use_retry_wrapper=True, version=None,
parallel_upload=False, multithreaded=False, infra_step=True,
......
recipes/recipe_modules/gsutil/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -5,7 +5,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"-h",
"Cache-Control:no-cache",
......@@ -29,7 +29,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"-o",
"GSUtil:parallel_composite_upload_threshold=50M",
"-m",
......@@ -58,7 +58,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
"gs://example/some/random/path/**",
......@@ -73,7 +73,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"--force-version",
"3.25",
"----",
......@@ -90,7 +90,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
"gs://example/some/random/path/to/boom",
......@@ -105,7 +105,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
"gs://example/staging/to/boom",
......@@ -120,7 +120,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"signurl",
"path/to/key",
......@@ -135,7 +135,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"rm",
"gs://example/staging/to/boom"
......@@ -149,7 +149,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"ls",
"gs://example/foo"
......@@ -163,7 +163,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
"gs://example/some/random/path/to/boom",
......@@ -181,7 +181,7 @@
"-u",
"RECIPE_MODULE[depot_tools::gsutil]/resources/gsutil_smart_retry.py",
"--",
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cat",
"gs://example/foo"
......
recipes/recipe_modules/infra_paths/path_config.py
View file @ efc7e91f
......@@ -2,8 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
import DEPS
CONFIG_CTX = DEPS['path'].CONFIG_CTX
from RECIPE_MODULES.recipe_engine.path import CONFIG_CTX
@CONFIG_CTX()
......
recipes/recipe_modules/presubmit/api.py
View file @ efc7e91f
......@@ -7,7 +7,7 @@ from recipe_engine import recipe_api
class PresubmitApi(recipe_api.RecipeApi):
@property
def presubmit_support_path(self):
return self.package_repo_resource('presubmit_support.py')
return self.repo_resource('presubmit_support.py')
def __call__(self, *args, **kwargs):
"""Return a presubmit step."""
......
recipes/recipe_modules/presubmit/examples/full.expected/basic.json
View file @ efc7e91f
......@@ -3,11 +3,11 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/presubmit_support.py"
"RECIPE_REPO[depot_tools]/presubmit_support.py"
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"name": "presubmit"
......
recipes/recipe_modules/tryserver/api.py
View file @ efc7e91f
......@@ -263,7 +263,7 @@ class TryserverApi(recipe_api.RecipeApi):
int(self.gerrit_change.patchset))
result = self.m.python(
'parse description', self.package_repo_resource('git_footers.py'),
'parse description', self.repo_resource('git_footers.py'),
args=['--json', self.m.json.output()],
stdin=self.m.raw_io.input(data=patch_text))
return result.json.output
......
recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/git_footers.py",
"RECIPE_REPO[depot_tools]/git_footers.py",
"--json",
"/path/to/tmp/json"
],
......@@ -29,7 +29,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/git_footers.py",
"RECIPE_REPO[depot_tools]/git_footers.py",
"--json",
"/path/to/tmp/json"
],
......
recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -42,7 +42,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -58,7 +58,7 @@
"ALL_COMMITS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit changes",
......@@ -90,7 +90,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/git_footers.py",
"RECIPE_REPO[depot_tools]/git_footers.py",
"--json",
"/path/to/tmp/json"
],
......
recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json
View file @ efc7e91f
......@@ -3,7 +3,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -19,7 +19,7 @@
"DOWNLOAD_COMMANDS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit fetch current CL info",
......@@ -42,7 +42,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
"RECIPE_REPO[depot_tools]/gerrit_client.py",
"changes",
"--host",
"https://chromium-review.googlesource.com",
......@@ -58,7 +58,7 @@
"ALL_COMMITS"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_REPO[depot_tools]"
},
"infra_step": true,
"name": "gerrit changes",
......@@ -90,7 +90,7 @@
"cmd": [
"python",
"-u",
"RECIPE_PACKAGE_REPO[depot_tools]/git_footers.py",
"RECIPE_REPO[depot_tools]/git_footers.py",
"--json",
"/path/to/tmp/json"
],
......
recipes/recipes.py
View file @ efc7e91f
......@@ -69,7 +69,10 @@ def parse(repo_root, recipes_cfg_path):
# If we're running ./recipes.py from the recipe_engine repo itself, then
# return None to signal that there's no EngineDep.
if pb['project_id'] == 'recipe_engine':
repo_name = pb.get('repo_name')
if not repo_name:
repo_name = pb['project_id']
if repo_name == 'recipe_engine':
return None, pb.get('recipes_path', '')
engine = pb['deps']['recipe_engine']
......
recipes/recipes/fetch_end_to_end_test.expected/basic.json
View file @ efc7e91f
......@@ -19,7 +19,7 @@
],
"env_prefixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
"RECIPE_REPO[depot_tools]"
]
},
"infra_step": true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment