From efc7e91fa76494f7f134926a384f4c0101ae982c Mon Sep 17 00:00:00 2001 From: Robert Iannucci Date: Fri, 15 Feb 2019 19:48:48 +0000 Subject: [PATCH] [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 Reviewed-by: Stephen Martinis Reviewed-by: Andrii Shyshkalov --- infra/config/recipes.cfg | 2 +- recipes/README.recipes.md | 32 ++++++++--------- .../examples/full.expected/basic.json | 2 +- .../examples/full.expected/basic_luci.json | 2 +- .../basic_with_branch_heads.json | 2 +- .../examples/full.expected/clobber.json | 4 +-- .../deprecated_got_revision_mapping.json | 8 ++--- .../gerrit_no_rebase_patch_ref.json | 4 +-- .../full.expected/gerrit_no_reset.json | 4 +-- .../input_commit_with_id_without_repo.json | 4 +-- .../full.expected/multiple_patch_refs.json | 4 +-- .../no_apply_patch_on_gclient.json | 8 ++--- .../examples/full.expected/refs.json | 4 +-- .../reset_root_solution_revision.json | 4 +-- .../examples/full.expected/tryjob_fail.json | 6 ++-- .../full.expected/tryjob_fail_patch.json | 6 ++-- .../tryjob_fail_patch_download.json | 6 ++-- .../full.expected/tryjob_gerrit_angle.json | 8 ++--- .../tryjob_gerrit_branch_heads.json | 8 ++--- .../tryjob_gerrit_feature_branch.json | 8 ++--- .../tryjob_gerrit_v8_feature_branch.json | 8 ++--- .../full.expected/tryjob_gerrit_webrtc.json | 8 ++--- .../examples/full.expected/tryjob_v8.json | 8 ++--- .../tryjob_v8_head_by_default.json | 8 ++--- .../full.expected/with_manifest_name.json | 2 +- .../examples/full.expected/with_tags.json | 4 +-- recipes/recipe_modules/depot_tools/api.py | 18 +++++----- .../examples/full.expected/basic.json | 20 +++++------ .../examples/full.expected/basic_luci.json | 20 +++++------ .../examples/full.expected/win.json | 20 +++++------ recipes/recipe_modules/gclient/api.py | 4 +-- .../gclient/examples/full.expected/basic.json | 36 +++++++++---------- .../examples/full.expected/buildbot.json | 36 +++++++++---------- .../examples/full.expected/revision.json | 36 +++++++++---------- .../examples/full.expected/tryserver.json | 36 +++++++++---------- recipes/recipe_modules/gerrit/api.py | 4 +-- .../gerrit/examples/full.expected/basic.json | 24 ++++++------- recipes/recipe_modules/git/api.py | 4 +-- .../git/examples/full.expected/basic.json | 6 ++-- .../examples/full.expected/basic_branch.json | 6 ++-- .../full.expected/basic_file_name.json | 6 ++-- .../examples/full.expected/basic_hash.json | 6 ++-- .../examples/full.expected/basic_luci.json | 6 ++-- .../git/examples/full.expected/basic_ref.json | 6 ++-- .../basic_submodule_update_force.json | 6 ++-- .../examples/full.expected/basic_tags.json | 6 ++-- .../full.expected/can_fail_build.json | 2 +- .../full.expected/cannot_fail_build.json | 6 ++-- .../examples/full.expected/cat-file_test.json | 6 ++-- .../full.expected/count-objects_delta.json | 6 ++-- .../full.expected/count-objects_failed.json | 6 ++-- .../count-objects_with_bad_output.json | 6 ++-- ...t-objects_with_bad_output_fails_build.json | 2 +- .../full.expected/curl_trace_file.json | 6 ++-- .../full.expected/git-cache-checkout.json | 12 +++---- .../examples/full.expected/platform_win.json | 6 ++-- .../examples/full.expected/rebase_failed.json | 6 ++-- .../full.expected/remote_not_origin.json | 6 ++-- .../full.expected/set_got_revision.json | 6 ++-- recipes/recipe_modules/git_cl/api.py | 2 +- .../git_cl/examples/full.expected/basic.json | 14 ++++---- recipes/recipe_modules/gsutil/api.py | 2 +- .../gsutil/examples/full.expected/basic.json | 22 ++++++------ .../recipe_modules/infra_paths/path_config.py | 3 +- recipes/recipe_modules/presubmit/api.py | 2 +- .../examples/full.expected/basic.json | 4 +-- recipes/recipe_modules/tryserver/api.py | 2 +- .../examples/full.expected/basic_tags.json | 4 +-- .../full.expected/with_gerrit_patch.json | 10 +++--- .../with_gerrit_patch_and_target_ref.json | 10 +++--- recipes/recipes.py | 5 ++- .../fetch_end_to_end_test.expected/basic.json | 2 +- 72 files changed, 315 insertions(+), 313 deletions(-) diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg index 735e823ac..ed4c699a6 100644 --- a/infra/config/recipes.cfg +++ b/infra/config/recipes.cfg @@ -15,7 +15,7 @@ "deps": { "recipe_engine": { "branch": "master", - "revision": "feac5f657c68d422c5209da0b47e5f5e74cbeac4", + "revision": "a42dce4e0b0db8bd6b7688030e723197919306db", "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git" } }, diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index e08c19d1a..a256da6ad 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -1,5 +1,5 @@ -# 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! — **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 diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json index 7b84e7934..99414d07b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json @@ -20,7 +20,7 @@ ], "env_prefixes": { "PATH": [ - "RECIPE_PACKAGE_REPO[depot_tools]" + "RECIPE_REPO[depot_tools]" ] }, "infra_step": true, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json index 961c89079..d1e156901 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_luci.json @@ -20,7 +20,7 @@ ], "env_suffixes": { "PATH": [ - "RECIPE_PACKAGE_REPO[depot_tools]" + "RECIPE_REPO[depot_tools]" ] }, "infra_step": true, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json index edd779cb3..3187d3a40 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json @@ -21,7 +21,7 @@ ], "env_prefixes": { "PATH": [ - "RECIPE_PACKAGE_REPO[depot_tools]" + "RECIPE_REPO[depot_tools]" ] }, "infra_step": true, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json index e23b30b75..60821e2c4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json index 8e38196ea..d023d167d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json index 7a234b4ff..33413d43b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json index 052c77bbf..02c5d6e16 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json index 1685ef3e2..35742c7c5 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json index 4a5d5dee5..1c68626f2 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json index 741d5ac9f..15e69d6cc 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json index 7bae48d4e..7b2971a27 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json index d904b67a1..901a047a3 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json @@ -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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json index 94b7a8f50..84cf400b3 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json index 0cf6fe9ce..5b1a618c4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json index 2e08b50ce..f8551c48e 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json index 741d5ac9f..15e69d6cc 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json index 53dffd750..717544d5f 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json index 2fe422310..fc5623ba4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json index ba1ab3fa1..d1a08a03b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json index 2ed16a535..c7de0a0e4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json index 1385ac8d7..910d6882d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json index c540244e8..fb1108b7a 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json index 7b84e7934..99414d07b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_manifest_name.json @@ -20,7 +20,7 @@ ], "env_prefixes": { "PATH": [ - "RECIPE_PACKAGE_REPO[depot_tools]" + "RECIPE_REPO[depot_tools]" ] }, "infra_step": true, diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json index f80cfadde..2e21a83bd 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json @@ -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, diff --git a/recipes/recipe_modules/depot_tools/api.py b/recipes/recipe_modules/depot_tools/api.py index c155711be..f185f5ffd 100644 --- a/recipes/recipe_modules/depot_tools/api.py +++ b/recipes/recipe_modules/depot_tools/api.py @@ -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): diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json index b78d46292..16894fc90 100644 --- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json +++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic.json @@ -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" diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json b/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json index 1524e68cb..a1a32a35a 100644 --- a/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json +++ b/recipes/recipe_modules/depot_tools/examples/full.expected/basic_luci.json @@ -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" diff --git a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json index 50f440193..2185d0eed 100644 --- a/recipes/recipe_modules/depot_tools/examples/full.expected/win.json +++ b/recipes/recipe_modules/depot_tools/examples/full.expected/win.json @@ -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" diff --git a/recipes/recipe_modules/gclient/api.py b/recipes/recipe_modules/gclient/api.py index 55d5b0b26..25e646876 100644 --- a/recipes/recipe_modules/gclient/api.py +++ b/recipes/recipe_modules/gclient/api.py @@ -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) diff --git a/recipes/recipe_modules/gclient/examples/full.expected/basic.json b/recipes/recipe_modules/gclient/examples/full.expected/basic.json index 24ff2dbf5..d5d0ffde3 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/basic.json @@ -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" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/buildbot.json b/recipes/recipe_modules/gclient/examples/full.expected/buildbot.json index f65be8d95..1f67bc51d 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/buildbot.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/buildbot.json @@ -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" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/revision.json b/recipes/recipe_modules/gclient/examples/full.expected/revision.json index e75ede70e..8ad345150 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/revision.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/revision.json @@ -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" diff --git a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json index 24ff2dbf5..d5d0ffde3 100644 --- a/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json +++ b/recipes/recipe_modules/gclient/examples/full.expected/tryserver.json @@ -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" diff --git a/recipes/recipe_modules/gerrit/api.py b/recipes/recipe_modules/gerrit/api.py index 4e1f2dd72..17f7e6aa6 100644 --- a/recipes/recipe_modules/gerrit/api.py +++ b/recipes/recipe_modules/gerrit/api.py @@ -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) diff --git a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json index 6f936980e..b406f1453 100644 --- a/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gerrit/examples/full.expected/basic.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "PATH": ":RECIPE_REPO[depot_tools]" }, "infra_step": true, "name": "gerrit changes (3)", diff --git a/recipes/recipe_modules/git/api.py b/recipes/recipe_modules/git/api.py index 2cdb0ec93..fbd4c3869 100644 --- a/recipes/recipe_modules/git/api.py +++ b/recipes/recipe_modules/git/api.py @@ -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]) diff --git a/recipes/recipe_modules/git/examples/full.expected/basic.json b/recipes/recipe_modules/git/examples/full.expected/basic.json index 50a50d8c6..5f354c416 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -174,7 +174,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -189,7 +189,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_branch.json b/recipes/recipe_modules/git/examples/full.expected/basic_branch.json index d24ec6416..025239072 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_branch.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_branch.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -174,7 +174,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -189,7 +189,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json b/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json index 87eee358e..ffa043e04 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_file_name.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -176,7 +176,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -191,7 +191,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_hash.json b/recipes/recipe_modules/git/examples/full.expected/basic_hash.json index 7c690f676..4604fe8aa 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_hash.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_hash.json @@ -22,7 +22,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -173,7 +173,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -188,7 +188,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_luci.json b/recipes/recipe_modules/git/examples/full.expected/basic_luci.json index 08a31361b..469724a6a 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_luci.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_luci.json @@ -22,7 +22,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -173,7 +173,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -188,7 +188,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_ref.json b/recipes/recipe_modules/git/examples/full.expected/basic_ref.json index 9875b7f33..0ca8d49ae 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_ref.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_ref.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -174,7 +174,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -189,7 +189,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json b/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json index edffefda7..67ee0cdf5 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_submodule_update_force.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -175,7 +175,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -190,7 +190,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/basic_tags.json b/recipes/recipe_modules/git/examples/full.expected/basic_tags.json index 198bacd55..1a2030ef4 100644 --- a/recipes/recipe_modules/git/examples/full.expected/basic_tags.json +++ b/recipes/recipe_modules/git/examples/full.expected/basic_tags.json @@ -24,7 +24,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -175,7 +175,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -190,7 +190,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json index 822de36c2..3a2a9d317 100644 --- a/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json +++ b/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" diff --git a/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json b/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json index 83fc8db45..6b574e82f 100644 --- a/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json +++ b/recipes/recipe_modules/git/examples/full.expected/cannot_fail_build.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -178,7 +178,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -193,7 +193,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json b/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json index 5a15a69d6..97dce1044 100644 --- a/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json +++ b/recipes/recipe_modules/git/examples/full.expected/cat-file_test.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -174,7 +174,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -189,7 +189,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json b/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json index 9ae5e400d..aa2e147ad 100644 --- a/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json +++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_delta.json @@ -45,7 +45,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -249,7 +249,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -264,7 +264,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json b/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json index 79cf1c209..9d127ca15 100644 --- a/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json +++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_failed.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -178,7 +178,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -193,7 +193,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json index 71188b4f0..41163419c 100644 --- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json +++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -179,7 +179,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -194,7 +194,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json index 82770e518..9024c0ec0 100644 --- a/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json +++ b/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" diff --git a/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json b/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json index b981bd131..38ff8fcd8 100644 --- a/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json +++ b/recipes/recipe_modules/git/examples/full.expected/curl_trace_file.json @@ -24,7 +24,7 @@ "cwd": "[START_DIR]/src", "env": { "GIT_CURL_VERBOSE": "1", - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch", @@ -176,7 +176,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -191,7 +191,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json b/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json index bca21b605..861d5a48c 100644 --- a/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json +++ b/recipes/recipe_modules/git/examples/full.expected/git-cache-checkout.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "populate cache" @@ -40,7 +40,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git cache", @@ -56,7 +56,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git remote" @@ -73,7 +73,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -224,7 +224,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -239,7 +239,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/platform_win.json b/recipes/recipe_modules/git/examples/full.expected/platform_win.json index 4f09ba3c7..246bf6659 100644 --- a/recipes/recipe_modules/git/examples/full.expected/platform_win.json +++ b/recipes/recipe_modules/git/examples/full.expected/platform_win.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]\\src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools];" + "PATH": "RECIPE_REPO[depot_tools];" }, "infra_step": true, "name": "git fetch" @@ -174,7 +174,7 @@ ], "cwd": "[START_DIR]\\src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools];" + "PATH": "RECIPE_REPO[depot_tools];" }, "infra_step": true, "name": "git new-branch refactor" @@ -189,7 +189,7 @@ ], "cwd": "[START_DIR]\\src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools];" + "PATH": "RECIPE_REPO[depot_tools];" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json index 70b082f0b..338c8729f 100644 --- a/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json +++ b/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -174,7 +174,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -189,7 +189,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json b/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json index 87bf92824..ef1fac56b 100644 --- a/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json +++ b/recipes/recipe_modules/git/examples/full.expected/remote_not_origin.json @@ -25,7 +25,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -176,7 +176,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -191,7 +191,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json b/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json index 245a06bf6..bd4e31ab1 100644 --- a/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json +++ b/recipes/recipe_modules/git/examples/full.expected/set_got_revision.json @@ -23,7 +23,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git fetch" @@ -175,7 +175,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch refactor" @@ -190,7 +190,7 @@ ], "cwd": "[START_DIR]/src", "env": { - "PATH": "RECIPE_PACKAGE_REPO[depot_tools]:" + "PATH": "RECIPE_REPO[depot_tools]:" }, "infra_step": true, "name": "git new-branch feature" diff --git a/recipes/recipe_modules/git_cl/api.py b/recipes/recipe_modules/git_cl/api.py index 47ed09505..e39b1c328 100644 --- a/recipes/recipe_modules/git_cl/api.py +++ b/recipes/recipe_modules/git_cl/api.py @@ -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): diff --git a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json index 222a8de38..88717fab4 100644 --- a/recipes/recipe_modules/git_cl/examples/full.expected/basic.json +++ b/recipes/recipe_modules/git_cl/examples/full.expected/basic.json @@ -1,7 +1,7 @@ [ { "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" ], diff --git a/recipes/recipe_modules/gsutil/api.py b/recipes/recipe_modules/gsutil/api.py index 81b288c0d..4724ab51b 100644 --- a/recipes/recipe_modules/gsutil/api.py +++ b/recipes/recipe_modules/gsutil/api.py @@ -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, diff --git a/recipes/recipe_modules/gsutil/examples/full.expected/basic.json b/recipes/recipe_modules/gsutil/examples/full.expected/basic.json index 4b4915f02..6ce64eabd 100644 --- a/recipes/recipe_modules/gsutil/examples/full.expected/basic.json +++ b/recipes/recipe_modules/gsutil/examples/full.expected/basic.json @@ -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" diff --git a/recipes/recipe_modules/infra_paths/path_config.py b/recipes/recipe_modules/infra_paths/path_config.py index e39de94ef..f4492496a 100644 --- a/recipes/recipe_modules/infra_paths/path_config.py +++ b/recipes/recipe_modules/infra_paths/path_config.py @@ -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() diff --git a/recipes/recipe_modules/presubmit/api.py b/recipes/recipe_modules/presubmit/api.py index 4bff17796..5ba591a16 100644 --- a/recipes/recipe_modules/presubmit/api.py +++ b/recipes/recipe_modules/presubmit/api.py @@ -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.""" diff --git a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json index 273c2cacd..5ec78b930 100644 --- a/recipes/recipe_modules/presubmit/examples/full.expected/basic.json +++ b/recipes/recipe_modules/presubmit/examples/full.expected/basic.json @@ -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" diff --git a/recipes/recipe_modules/tryserver/api.py b/recipes/recipe_modules/tryserver/api.py index 6b039eb16..5029498d1 100644 --- a/recipes/recipe_modules/tryserver/api.py +++ b/recipes/recipe_modules/tryserver/api.py @@ -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 diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json b/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json index aa39310bf..01b1be90b 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/basic_tags.json @@ -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" ], diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json index b17395b3f..f06fe4bc7 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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" ], diff --git a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json index e880ab211..22b4c6d20 100644 --- a/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json +++ b/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json @@ -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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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": ":RECIPE_PACKAGE_REPO[depot_tools]" + "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" ], diff --git a/recipes/recipes.py b/recipes/recipes.py index 114821da7..077057eb4 100755 --- a/recipes/recipes.py +++ b/recipes/recipes.py @@ -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'] diff --git a/recipes/recipes/fetch_end_to_end_test.expected/basic.json b/recipes/recipes/fetch_end_to_end_test.expected/basic.json index 5fc927f03..4157b45c1 100644 --- a/recipes/recipes/fetch_end_to_end_test.expected/basic.json +++ b/recipes/recipes/fetch_end_to_end_test.expected/basic.json @@ -19,7 +19,7 @@ ], "env_prefixes": { "PATH": [ - "RECIPE_PACKAGE_REPO[depot_tools]" + "RECIPE_REPO[depot_tools]" ] }, "infra_step": true,