Skip to content

C
Chromium_Depot_tools
Commit cd8d4a65 authored by Andrii Shyshkalov's avatar Andrii Shyshkalov Committed by Commit Bot
Browse files
Options

gclient recipe: use env_suffixes insetad of custom ENV manipulation. 

R=iannucci@chromium.org

Recipe-Nontrivial-Roll: skia
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: release_scripts
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build
Change-Id: Ie0b042389b7e2c505cd8dbecc1a30a37244ae238
Reviewed-on: https://chromium-review.googlesource.com/1100110Reviewed-by: 's avatarRobbie Iannucci <iannucci@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
parent 41ff7a03
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 93 deletions
recipes/README.recipes.md
View file @ cd8d4a65
......@@ -226,12 +226,12 @@ Returns (Path): The "depot_tools" root directory.
Wrapper for easy calling of gclient steps.
&mdash; **def [break\_locks](/recipes/recipe_modules/gclient/api.py#288)(self):**
&mdash; **def [break\_locks](/recipes/recipe_modules/gclient/api.py#283)(self):**
Remove all index.lock files. If a previous run of git crashed, bot was
reset, etc... we might end up with leftover index.lock files.
&mdash; **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#310)(self, patch_project, gclient_config=None, patch_repo=None):**
&mdash; **def [calculate\_patch\_root](/recipes/recipe_modules/gclient/api.py#305)(self, patch_project, gclient_config=None, patch_repo=None):**
Returns path where a patch should be applied to based patch_project.
......@@ -250,15 +250,15 @@ Returns:
If patch_project is not given or not recognized, it'll be just first
solution root.
&mdash; **def [checkout](/recipes/recipe_modules/gclient/api.py#235)(self, gclient_config=None, revert=RevertOnTryserver, inject_parent_got_revision=True, extra_sync_flags=None, \*\*kwargs):**
&mdash; **def [checkout](/recipes/recipe_modules/gclient/api.py#230)(self, gclient_config=None, revert=RevertOnTryserver, inject_parent_got_revision=True, extra_sync_flags=None, \*\*kwargs):**
Return a step generator function for gclient checkouts.
&emsp; **@staticmethod**<br>&mdash; **def [config\_to\_pythonish](/recipes/recipe_modules/gclient/api.py#125)(cfg):**
&emsp; **@staticmethod**<br>&mdash; **def [config\_to\_pythonish](/recipes/recipe_modules/gclient/api.py#120)(cfg):**
&mdash; **def [get\_config\_defaults](/recipes/recipe_modules/gclient/api.py#119)(self):**
&mdash; **def [get\_config\_defaults](/recipes/recipe_modules/gclient/api.py#114)(self):**
&emsp; **@staticmethod**<br>&mdash; **def [got\_revision\_reverse\_mapping](/recipes/recipe_modules/gclient/api.py#130)(cfg):**
&emsp; **@staticmethod**<br>&mdash; **def [got\_revision\_reverse\_mapping](/recipes/recipe_modules/gclient/api.py#125)(cfg):**
Returns the merged got_revision_reverse_mapping.
......@@ -266,7 +266,7 @@ Returns (dict): A mapping from property name -> project name. It merges the
values of the deprecated got_revision_mapping and the new
got_revision_reverse_mapping.
&mdash; **def [inject\_parent\_got\_revision](/recipes/recipe_modules/gclient/api.py#210)(self, gclient_config=None, override=False):**
&mdash; **def [inject\_parent\_got\_revision](/recipes/recipe_modules/gclient/api.py#205)(self, gclient_config=None, override=False):**
Match gclient config to build revisions obtained from build_properties.
......@@ -276,7 +276,7 @@ Args:
override (bool) - If True, will forcibly set revision and custom_vars
even if the config already contains values for them.
&emsp; **@property**<br>&mdash; **def [is\_blink\_mode](/recipes/recipe_modules/gclient/api.py#275)(self):**
&emsp; **@property**<br>&mdash; **def [is\_blink\_mode](/recipes/recipe_modules/gclient/api.py#270)(self):**
Indicates wether the caller is to use the Blink config rather than the
Chromium config. This may happen for one of two reasons:
......@@ -285,22 +285,22 @@ Chromium config. This may happen for one of two reasons:
2. A try job comes in that applies to the Blink tree. (patch_project is
blink)
&mdash; **def [resolve\_revision](/recipes/recipe_modules/gclient/api.py#147)(self, revision):**
&mdash; **def [resolve\_revision](/recipes/recipe_modules/gclient/api.py#142)(self, revision):**
&mdash; **def [runhooks](/recipes/recipe_modules/gclient/api.py#269)(self, args=None, name='runhooks', \*\*kwargs):**
&mdash; **def [runhooks](/recipes/recipe_modules/gclient/api.py#264)(self, args=None, name='runhooks', \*\*kwargs):**
&mdash; **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#342)(self, patch_project, gclient_config=None):**
&mdash; **def [set\_patch\_project\_revision](/recipes/recipe_modules/gclient/api.py#337)(self, patch_project, gclient_config=None):**
Updates config revision corresponding to patch_project.
Useful for bot_update only, as this is the only consumer of gclient's config
revision map. This doesn't overwrite the revision if it was already set.
&emsp; **@spec_alias.deleter**<br>&mdash; **def [spec\_alias](/recipes/recipe_modules/gclient/api.py#115)(self):**
&emsp; **@spec_alias.deleter**<br>&mdash; **def [spec\_alias](/recipes/recipe_modules/gclient/api.py#110)(self):**
&mdash; **def [sync](/recipes/recipe_modules/gclient/api.py#152)(self, cfg, extra_sync_flags=None, \*\*kwargs):**
&mdash; **def [sync](/recipes/recipe_modules/gclient/api.py#147)(self, cfg, extra_sync_flags=None, \*\*kwargs):**
&emsp; **@use_mirror.setter**<br>&mdash; **def [use\_mirror](/recipes/recipe_modules/gclient/api.py#102)(self, val):**
&emsp; **@use_mirror.setter**<br>&mdash; **def [use\_mirror](/recipes/recipe_modules/gclient/api.py#97)(self, val):**
### *recipe_modules* / [gerrit](/recipes/recipe_modules/gerrit)
[DEPS](/recipes/recipe_modules/gerrit/__init__.py#1): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
......
recipes/recipe_modules/gclient/api.py
View file @ cd8d4a65
......@@ -79,13 +79,8 @@ class GclientApi(recipe_api.RecipeApi):
if self.spec_alias:
prefix = ('[spec: %s] ' % self.spec_alias) + prefix
# TODO(phajdan.jr): create a helper for adding to PATH.
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)])
with self.m.context(env=env):
with self.m.context(
env_suffixes={'PATH': [self._module.PACKAGE_REPO_ROOT]}):
return self.m.python(prefix + name,
self.package_repo_resource('gclient.py'),
cmd,
......
recipes/recipe_modules/gclient/examples/full.expected/basic.json
View file @ cd8d4a65
......@@ -8,8 +8,10 @@
"--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": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient setup"
......@@ -33,8 +35,10 @@
"--output-json",
"/path/to/tmp/json"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient sync",
......@@ -60,8 +64,10 @@
"user.name",
"local_bot"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.name)"
......@@ -77,8 +83,10 @@
"user.email",
"local_bot@example.com"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.email)"
......@@ -93,8 +101,10 @@
"cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient setup"
......@@ -121,8 +131,10 @@
"/path/to/tmp/json"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient sync",
......@@ -153,8 +165,10 @@
"local_bot"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.name)"
......@@ -171,8 +185,10 @@
"local_bot@example.com"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.email)"
......@@ -209,8 +225,10 @@
"runhooks"
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
},
......
recipes/recipe_modules/gclient/examples/full.expected/buildbot.json
View file @ cd8d4a65
......@@ -8,8 +8,10 @@
"--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": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient setup"
......@@ -33,8 +35,10 @@
"--output-json",
"/path/to/tmp/json"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient sync",
......@@ -60,8 +64,10 @@
"user.name",
"local_bot"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.name)"
......@@ -77,8 +83,10 @@
"user.email",
"local_bot@example.com"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.email)"
......@@ -93,8 +101,10 @@
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient setup"
......@@ -121,8 +131,10 @@
"/path/to/tmp/json"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient sync",
......@@ -153,8 +165,10 @@
"local_bot"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.name)"
......@@ -171,8 +185,10 @@
"local_bot@example.com"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.email)"
......@@ -209,8 +225,10 @@
"runhooks"
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
},
......
recipes/recipe_modules/gclient/examples/full.expected/revision.json
View file @ cd8d4a65
......@@ -8,8 +8,10 @@
"--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": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient setup"
......@@ -35,8 +37,10 @@
"--output-json",
"/path/to/tmp/json"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient sync",
......@@ -62,8 +66,10 @@
"user.name",
"local_bot"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.name)"
......@@ -79,8 +85,10 @@
"user.email",
"local_bot@example.com"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.email)"
......@@ -95,8 +103,10 @@
"cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient setup"
......@@ -125,8 +135,10 @@
"/path/to/tmp/json"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient sync",
......@@ -157,8 +169,10 @@
"local_bot"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.name)"
......@@ -175,8 +189,10 @@
"local_bot@example.com"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.email)"
......@@ -213,8 +229,10 @@
"runhooks"
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
},
......
recipes/recipe_modules/gclient/examples/full.expected/tryserver.json
View file @ cd8d4a65
......@@ -8,8 +8,10 @@
"--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": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient setup"
......@@ -33,8 +35,10 @@
"--output-json",
"/path/to/tmp/json"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient sync",
......@@ -60,8 +64,10 @@
"user.name",
"local_bot"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.name)"
......@@ -77,8 +83,10 @@
"user.email",
"local_bot@example.com"
],
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "gclient recurse (git config user.email)"
......@@ -93,8 +101,10 @@
"cache_dir = '[CACHE]/git'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'Angle', 'url': 'https://chromium.googlesource.com/angle/angle.git'}]"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient setup"
......@@ -121,8 +131,10 @@
"/path/to/tmp/json"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient sync",
......@@ -153,8 +165,10 @@
"local_bot"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.name)"
......@@ -171,8 +185,10 @@
"local_bot@example.com"
],
"cwd": "[START_DIR]/src/third_party",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"infra_step": true,
"name": "[spec: Angle] gclient recurse (git config user.email)"
......@@ -209,8 +225,10 @@
"runhooks"
],
"cwd": "[START_DIR]/src",
"env": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
"env_suffixes": {
"PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
},
"name": "gclient runhooks"
},
......
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