Skip to content

C
Chromium_Depot_tools
Commit c91686c0 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot
Browse files
Options

Revert "Remove obsolete bot_update flag" 

This reverts commit 72048266.

Reason for revert: Skia depends on it. Need to clean that up first. Currently blocks roll:
https://skia-review.googlesource.com/c/14145/

Original change's description:
> Remove obsolete bot_update flag
> 
> Using the manifest is the default since a long time. The flag was only introduced to smoothly switch it on. Now the flag is not needed anymore.
> 
> Bug: 398105
> Change-Id: I4eb1c98e26e025a69f8b0a7c48877d78c031702e
> Reviewed-on: https://chromium-review.googlesource.com/485659
> Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
> Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> 

TBR=phajdan.jr@chromium.org,machenbach@chromium.org,tandrii@chromium.org,sergiyb@chromium.org,chromium-reviews@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Change-Id: Iffc4d8076abd3c92feebfd7f3ef88be7ce34b692
Reviewed-on: https://chromium-review.googlesource.com/486639Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
parent e35ed050
Hide whitespace changes
Inline Side-by-side
Showing with 179 additions and 163 deletions
recipes/recipe_modules/bot_update/api.py
View file @ c91686c0
...@@ -76,7 +76,8 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -76,7 +76,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
patch_root=None, no_shallow=False, patch_root=None, no_shallow=False,
with_branch_heads=False, with_tags=False, refs=None, with_branch_heads=False, with_tags=False, refs=None,
patch_oauth2=False, oauth2_json=False, patch_oauth2=False, oauth2_json=False,
use_site_config_creds=True, clobber=False, use_site_config_creds=True,
output_manifest=True, clobber=False,
root_solution_revision=None, rietveld=None, issue=None, root_solution_revision=None, rietveld=None, issue=None,
patchset=None, gerrit_no_reset=False, patchset=None, gerrit_no_reset=False,
gerrit_no_rebase_patch_ref=False, **kwargs): gerrit_no_rebase_patch_ref=False, **kwargs):
...@@ -231,6 +232,8 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -231,6 +232,8 @@ class BotUpdateApi(recipe_api.RecipeApi):
cmd.append('--clobber') cmd.append('--clobber')
if no_shallow: if no_shallow:
cmd.append('--no_shallow') cmd.append('--no_shallow')
if output_manifest:
cmd.append('--output_manifest')
if with_branch_heads or cfg.with_branch_heads: if with_branch_heads or cfg.with_branch_heads:
cmd.append('--with_branch_heads') cmd.append('--with_branch_heads')
if with_tags: if with_tags:
...@@ -244,7 +247,7 @@ class BotUpdateApi(recipe_api.RecipeApi): ...@@ -244,7 +247,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
first_sln = cfg.solutions[0].name first_sln = cfg.solutions[0].name
step_test_data = lambda: self.test_api.output_json( step_test_data = lambda: self.test_api.output_json(
root, first_sln, reverse_rev_map, self._fail_patch, root, first_sln, reverse_rev_map, self._fail_patch,
fixed_revisions=fixed_revisions) output_manifest=output_manifest, fixed_revisions=fixed_revisions)
# Add suffixes to the step name, if specified. # Add suffixes to the step name, if specified.
name = 'bot_update' name = 'bot_update'
......
recipes/recipe_modules/bot_update/example.expected/basic.json
View file @ c91686c0
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"abc\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
......
recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json 0 → 100644
View file @ c91686c0
[
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
"--patch_root",
"src",
"--revision_mapping_file",
"{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}",
"--git-cache-dir",
"[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--output_manifest"
],
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
"@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@",
"@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@"
]
},
{
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
"cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
"--patch_root",
"src",
"--revision_mapping_file",
"{\"got_cr_revision\": \"src\", \"got_revision\": \"src\"}",
"--git-cache-dir",
"[GIT_CACHE]",
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
],
"env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000",
"GIT_HTTP_LOW_SPEED_TIME": "300",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"infra_step": true,
"name": "bot_update (without patch)",
"~followup_annotations": [
"@@@STEP_TEXT@Some step text@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
},
{
"name": "$result",
"recipe_result": null,
"status_code": 0
}
]
\ No newline at end of file
recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json
View file @ c91686c0
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -72,7 +66,8 @@ ...@@ -72,7 +66,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/buildbot.json
View file @ c91686c0
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"abc\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
......
recipes/recipe_modules/bot_update/example.expected/clobber.json
View file @ c91686c0
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -72,7 +66,8 @@ ...@@ -72,7 +66,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json
View file @ c91686c0
...@@ -37,12 +37,6 @@ ...@@ -37,12 +37,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -75,7 +69,8 @@ ...@@ -75,7 +69,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json
View file @ c91686c0
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -72,7 +66,8 @@ ...@@ -72,7 +66,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json
View file @ c91686c0
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -72,7 +66,8 @@ ...@@ -72,7 +66,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/no_shallow.json
View file @ c91686c0
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -72,7 +66,8 @@ ...@@ -72,7 +66,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json
View file @ c91686c0
...@@ -31,12 +31,6 @@ ...@@ -31,12 +31,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"revision\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"revision\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -71,7 +65,8 @@ ...@@ -71,7 +65,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/trychange.json
View file @ c91686c0
...@@ -33,12 +33,6 @@ ...@@ -33,12 +33,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -73,7 +67,8 @@ ...@@ -73,7 +67,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json
View file @ c91686c0
...@@ -35,12 +35,6 @@ ...@@ -35,12 +35,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -75,7 +69,8 @@ ...@@ -75,7 +69,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json
View file @ c91686c0
...@@ -33,12 +33,6 @@ ...@@ -33,12 +33,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -73,7 +67,8 @@ ...@@ -73,7 +67,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json
View file @ c91686c0
...@@ -33,12 +33,6 @@ ...@@ -33,12 +33,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -73,7 +67,8 @@ ...@@ -73,7 +67,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob.json
View file @ c91686c0
...@@ -37,12 +37,6 @@ ...@@ -37,12 +37,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -79,7 +73,8 @@ ...@@ -79,7 +73,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json
View file @ c91686c0
...@@ -38,12 +38,6 @@ ...@@ -38,12 +38,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json
View file @ c91686c0
...@@ -38,12 +38,6 @@ ...@@ -38,12 +38,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_apply_return_code\": 1, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_apply_return_code\": 1, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
...@@ -108,7 +102,8 @@ ...@@ -108,7 +102,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json
View file @ c91686c0
...@@ -38,12 +38,6 @@ ...@@ -38,12 +38,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_apply_return_code\": 3, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_apply_return_code\": 3, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": true, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
...@@ -108,7 +102,8 @@ ...@@ -108,7 +102,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json
View file @ c91686c0
...@@ -38,12 +38,6 @@ ...@@ -38,12 +38,6 @@
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -80,7 +74,8 @@ ...@@ -80,7 +74,8 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision", "--revision",
"src/third_party/angle@HEAD" "src/third_party/angle@HEAD",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json
View file @ c91686c0
...@@ -38,12 +38,6 @@ ...@@ -38,12 +38,6 @@
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/third_party/angle\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -80,7 +74,8 @@ ...@@ -80,7 +74,8 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision", "--revision",
"src/third_party/angle@HEAD" "src/third_party/angle@HEAD",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json
View file @ c91686c0
...@@ -40,12 +40,6 @@ ...@@ -40,12 +40,6 @@
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"abc\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"abc\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -84,7 +78,8 @@ ...@@ -84,7 +78,8 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision", "--revision",
"src/v8@abc" "src/v8@abc",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json
View file @ c91686c0
...@@ -40,12 +40,6 @@ ...@@ -40,12 +40,6 @@
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src/v8\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -84,7 +78,8 @@ ...@@ -84,7 +78,8 @@
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--revision", "--revision",
"src/v8@HEAD" "src/v8@HEAD",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.expected/with_tags.json
View file @ c91686c0
...@@ -32,12 +32,6 @@ ...@@ -32,12 +32,6 @@
"@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
"@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
...@@ -72,7 +66,8 @@ ...@@ -72,7 +66,8 @@
"--output_json", "--output_json",
"/path/to/tmp/json", "/path/to/tmp/json",
"--revision", "--revision",
"src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
"--output_manifest"
], ],
"env": { "env": {
"GIT_HTTP_LOW_SPEED_LIMIT": "1000", "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
......
recipes/recipe_modules/bot_update/example.py
View file @ c91686c0
...@@ -31,6 +31,7 @@ def RunSteps(api): ...@@ -31,6 +31,7 @@ def RunSteps(api):
patch = api.properties.get('patch', True) patch = api.properties.get('patch', True)
clobber = True if api.properties.get('clobber') else False clobber = True if api.properties.get('clobber') else False
no_shallow = True if api.properties.get('no_shallow') else False no_shallow = True if api.properties.get('no_shallow') else False
output_manifest = api.properties.get('output_manifest', False)
with_branch_heads = api.properties.get('with_branch_heads', False) with_branch_heads = api.properties.get('with_branch_heads', False)
with_tags = api.properties.get('with_tags', False) with_tags = api.properties.get('with_tags', False)
refs = api.properties.get('refs', []) refs = api.properties.get('refs', [])
...@@ -53,6 +54,7 @@ def RunSteps(api): ...@@ -53,6 +54,7 @@ def RunSteps(api):
patch=patch, patch=patch,
with_branch_heads=with_branch_heads, with_branch_heads=with_branch_heads,
with_tags=with_tags, with_tags=with_tags,
output_manifest=output_manifest,
refs=refs, patch_oauth2=oauth2, refs=refs, patch_oauth2=oauth2,
oauth2_json=oauth2_json, oauth2_json=oauth2_json,
clobber=clobber, clobber=clobber,
...@@ -78,6 +80,9 @@ def GenTests(api): ...@@ -78,6 +80,9 @@ def GenTests(api):
with_branch_heads=True, with_branch_heads=True,
suffix='with branch heads' suffix='with branch heads'
) )
yield api.test('basic_output_manifest') + api.properties(
output_manifest=True,
)
yield api.test('with_tags') + api.properties(with_tags=True) yield api.test('with_tags') + api.properties(with_tags=True)
yield api.test('tryjob') + api.properties( yield api.test('tryjob') + api.properties(
issue=12345, issue=12345,
......
recipes/recipe_modules/bot_update/resources/bot_update.py
View file @ c91686c0
...@@ -919,6 +919,8 @@ def parse_args(): ...@@ -919,6 +919,8 @@ def parse_args():
'Can prepend root@<rev> to specify which repository, ' 'Can prepend root@<rev> to specify which repository, '
'where root is either a filesystem path or git https ' 'where root is either a filesystem path or git https '
'url. To specify Tip of Tree, set rev to HEAD. ') 'url. To specify Tip of Tree, set rev to HEAD. ')
parse.add_option('--output_manifest', action='store_true',
help=('Add manifest json to the json output.'))
parse.add_option('--clobber', action='store_true', parse.add_option('--clobber', action='store_true',
help='Delete checkout first, always') help='Delete checkout first, always')
parse.add_option('--output_json', parse.add_option('--output_json',
...@@ -1086,6 +1088,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow): ...@@ -1086,6 +1088,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
#raise Exception('No got_revision(s) found in gclient output') #raise Exception('No got_revision(s) found in gclient output')
if options.output_json: if options.output_json:
manifest = create_manifest() if options.output_manifest else None
# Tell recipes information such as root, got_revision, etc. # Tell recipes information such as root, got_revision, etc.
emit_json(options.output_json, emit_json(options.output_json,
did_run=True, did_run=True,
...@@ -1094,7 +1097,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow): ...@@ -1094,7 +1097,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
step_text=step_text, step_text=step_text,
fixed_revisions=revisions, fixed_revisions=revisions,
properties=got_revisions, properties=got_revisions,
manifest=create_manifest()) manifest=manifest)
def print_debug_info(): def print_debug_info():
......
recipes/recipe_modules/bot_update/test_api.py
View file @ c91686c0
...@@ -9,7 +9,7 @@ from recipe_engine import recipe_test_api ...@@ -9,7 +9,7 @@ from recipe_engine import recipe_test_api
class BotUpdateTestApi(recipe_test_api.RecipeTestApi): class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
def output_json(self, root, first_sln, revision_mapping, fail_patch=False, def output_json(self, root, first_sln, revision_mapping, fail_patch=False,
fixed_revisions=None): output_manifest=False, fixed_revisions=None):
"""Deterministically synthesize json.output test data for gclient's """Deterministically synthesize json.output test data for gclient's
--output-json option. --output-json option.
""" """
...@@ -35,15 +35,16 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi): ...@@ -35,15 +35,16 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
'step_text': 'Some step text' 'step_text': 'Some step text'
}) })
output.update({ if output_manifest:
'manifest': { output.update({
project_name: { 'manifest': {
'repository': 'https://fake.org/%s.git' % project_name, project_name: {
'revision': self.gen_revision(project_name), 'repository': 'https://fake.org/%s.git' % project_name,
'revision': self.gen_revision(project_name),
}
for project_name in set(revision_mapping.values())
} }
for project_name in set(revision_mapping.values()) })
}
})
if fixed_revisions: if fixed_revisions:
output['fixed_revisions'] = fixed_revisions output['fixed_revisions'] = fixed_revisions
......
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