Skip to content

C
Chromium_Depot_tools
Commit dc598e82 authored by Dan Jacques's avatar Dan Jacques Committed by Commit Bot
Browse files
Options

[bot_update] Prefix PATH, cleanup. 

Prefix "depot_tools" to PATH instead of appending. This will ensure that
"depot_tools" pulls resources from the recipe checkout as a preference,
not as a last resort.

Use "env_prefixes" instead of "env" to prefix PATH.

Remove Git speed limit settings, which are taken care of by the Git
wrapper now.

BUG=chromium:738176
TEST=expectations
R=hinoka@chromium.org, iannucci@chromium.org

Change-Id: I2e509a331266e867be323bc70e3bc0f08f85246f
Reviewed-on: https://chromium-review.googlesource.com/556287Reviewed-by: 's avatarRyan Tseng <hinoka@chromium.org>
Commit-Queue: Daniel Jacques <dnj@chromium.org>
parent 897bf0b0
Hide whitespace changes
Inline Side-by-side
Showing with 192 additions and 173 deletions
recipes/recipe_modules/bot_update/__init__.py
View file @ dc598e82
DEPS = [ DEPS = [
'depot_tools',
'gclient', 'gclient',
'recipe_engine/context', 'recipe_engine/context',
'recipe_engine/json', 'recipe_engine/json',
......
recipes/recipe_modules/bot_update/api.py
View file @ dc598e82
...@@ -33,16 +33,11 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -33,16 +33,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
assert isinstance(cmd, (list, tuple)) assert isinstance(cmd, (list, tuple))
bot_update_path = self.resource('bot_update.py') bot_update_path = self.resource('bot_update.py')
kwargs.setdefault('infra_step', True) kwargs.setdefault('infra_step', True)
env = self.m.context.env
env.setdefault('PATH', '%(PATH)s') env_prefixes = {
env['PATH'] = self.m.path.pathsep.join([ 'PATH': [self.m.depot_tools.root],
env['PATH'], str(self._module.PACKAGE_REPO_ROOT)]) }
# These are to prevent git from hanging. If the git connection is slower with self.m.context(env_prefixes=env_prefixes):
# than 1KB/s for more than 5 minutes then git will kill the connection
# and die with an error "error: RPC failed; curl 28 Operation too slow"
env['GIT_HTTP_LOW_SPEED_LIMIT'] = 1000
env['GIT_HTTP_LOW_SPEED_TIME'] = 300
with self.m.context(env=env):
return self.m.python(name, bot_update_path, cmd, **kwargs) return self.m.python(name, bot_update_path, cmd, **kwargs)
@property @property
...@@ -55,10 +50,6 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -55,10 +50,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
gerrit_no_rebase_patch_ref=False, **kwargs): gerrit_no_rebase_patch_ref=False, **kwargs):
apply_gerrit_path = self.resource('apply_gerrit.py') apply_gerrit_path = self.resource('apply_gerrit.py')
kwargs.setdefault('infra_step', True) kwargs.setdefault('infra_step', True)
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)])
cmd = [ cmd = [
'--gerrit_repo', self._repository, '--gerrit_repo', self._repository,
'--gerrit_ref', self._gerrit_ref or '', '--gerrit_ref', self._gerrit_ref or '',
...@@ -68,7 +59,11 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -68,7 +59,11 @@ class BotUpdateApi(recipe_api.RecipeApi):
cmd.append('--gerrit_no_reset') cmd.append('--gerrit_no_reset')
if gerrit_no_rebase_patch_ref: if gerrit_no_rebase_patch_ref:
cmd.append('--gerrit_no_rebase_patch_ref') cmd.append('--gerrit_no_rebase_patch_ref')
with self.m.context(env=env):
env_prefixes = {
'PATH': [self.m.depot_tools.root],
}
with self.m.context(env_prefixes=env_prefixes):
return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs) return self.m.python('apply_gerrit', apply_gerrit_path, cmd, **kwargs)
def ensure_checkout(self, gclient_config=None, suffix=None, def ensure_checkout(self, gclient_config=None, suffix=None,
......
recipes/recipe_modules/bot_update/examples/full.expected/apply_gerrit_ref.json
View file @ dc598e82
...@@ -13,8 +13,10 @@ ...@@ -13,8 +13,10 @@
"--gerrit_no_reset", "--gerrit_no_reset",
"--gerrit_no_rebase_patch_ref" "--gerrit_no_rebase_patch_ref"
], ],
"env": { "env_prefixes": {
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" "PATH": [
"RECIPE_PACKAGE_REPO[depot_tools]"
]
}, },
"infra_step": true, "infra_step": true,
"name": "apply_gerrit" "name": "apply_gerrit"
......
recipes/recipe_modules/bot_update/examples/full.expected/basic.json
View file @ dc598e82
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
"src@abc", "src@abc",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
View file @ dc598e82
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
"--with_branch_heads", "--with_branch_heads",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update - with branch heads", "name": "bot_update - with branch heads",
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/buildbot.json
View file @ dc598e82
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
"src@abc", "src@abc",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
View file @ dc598e82
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
"--clobber", "--clobber",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -82,10 +82,10 @@ ...@@ -82,10 +82,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
View file @ dc598e82
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
"--gerrit_no_rebase_patch_ref", "--gerrit_no_rebase_patch_ref",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
View file @ dc598e82
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
"--gerrit_no_reset", "--gerrit_no_reset",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_shallow.json
View file @ dc598e82
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
"--no_shallow", "--no_shallow",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
View file @ dc598e82
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
"src@revision", "src@revision",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -78,10 +78,10 @@ ...@@ -78,10 +78,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/trychange.json
View file @ dc598e82
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"+refs/change/1/2/333", "+refs/change/1/2/333",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_buildbot.json
View file @ dc598e82
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -82,10 +82,10 @@ ...@@ -82,10 +82,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_json.json
View file @ dc598e82
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/trychange_oauth2_json_win.json
View file @ dc598e82
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>;RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -86,10 +86,10 @@ ...@@ -86,10 +86,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src@HEAD", "src@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src/third_party/angle@HEAD", "src/third_party/angle@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -87,10 +87,10 @@ ...@@ -87,10 +87,10 @@
"--revision", "--revision",
"src/third_party/angle@HEAD" "src/third_party/angle@HEAD"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json
View file @ dc598e82
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
"src/third_party/angle@HEAD", "src/third_party/angle@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -87,10 +87,10 @@ ...@@ -87,10 +87,10 @@
"--revision", "--revision",
"src/third_party/angle@HEAD" "src/third_party/angle@HEAD"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
View file @ dc598e82
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
"src/v8@abc", "src/v8@abc",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -91,10 +91,10 @@ ...@@ -91,10 +91,10 @@
"--revision", "--revision",
"src/v8@abc" "src/v8@abc"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
View file @ dc598e82
...@@ -28,10 +28,10 @@ ...@@ -28,10 +28,10 @@
"src/v8@HEAD", "src/v8@HEAD",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -91,10 +91,10 @@ ...@@ -91,10 +91,10 @@
"--revision", "--revision",
"src/v8@HEAD" "src/v8@HEAD"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
View file @ dc598e82
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
"--with_tags", "--with_tags",
"--disable-syntax-validation" "--disable-syntax-validation"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update", "name": "bot_update",
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9"
], ],
"env": { "env_prefixes": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "PATH": [
"GIT_HTTP_LOW_SPEED_TIME": "300", "RECIPE_PACKAGE_REPO[depot_tools]"
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]" ]
}, },
"infra_step": true, "infra_step": true,
"name": "bot_update (without patch)", "name": "bot_update (without patch)",
......
recipes/recipe_modules/depot_tools/api.py
View file @ dc598e82
...@@ -13,6 +13,11 @@ class DepotToolsApi(recipe_api.RecipeApi): ...@@ -13,6 +13,11 @@ class DepotToolsApi(recipe_api.RecipeApi):
def upload_to_google_storage_path(self): def upload_to_google_storage_path(self):
return self.package_repo_resource('upload_to_google_storage.py') return self.package_repo_resource('upload_to_google_storage.py')
@property
def root(self):
"""Returns (Path): The "depot_tools" root directory."""
return self.package_repo_resource()
@property @property
def cros_path(self): def cros_path(self):
return self.package_repo_resource('cros') return self.package_repo_resource('cros')
......
recipes/recipe_modules/depot_tools/examples/full.expected/basic.json
View file @ dc598e82
[ [
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]"
],
"name": "root"
},
{ {
"cmd": [ "cmd": [
"ls", "ls",
......
recipes/recipe_modules/depot_tools/examples/full.expected/win.json
View file @ dc598e82
[ [
{
"cmd": [
"ls",
"RECIPE_PACKAGE_REPO[depot_tools]"
],
"name": "root"
},
{ {
"cmd": [ "cmd": [
"ls", "ls",
......
recipes/recipe_modules/depot_tools/examples/full.py
View file @ dc598e82
...@@ -11,6 +11,8 @@ DEPS = [ ...@@ -11,6 +11,8 @@ DEPS = [
def RunSteps(api): def RunSteps(api):
api.step('root', ['ls', api.depot_tools.root])
api.step( api.step(
'download_from_google_storage', 'download_from_google_storage',
['ls', api.depot_tools.download_from_google_storage_path]) ['ls', api.depot_tools.download_from_google_storage_path])
......
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