diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index f9db836b6..fb92ea09e 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -76,7 +76,8 @@ class BotUpdateApi(recipe_api.RecipeApi): patch_root=None, no_shallow=False, with_branch_heads=False, with_tags=False, refs=None, 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, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, **kwargs): @@ -231,6 +232,8 @@ class BotUpdateApi(recipe_api.RecipeApi): cmd.append('--clobber') if no_shallow: cmd.append('--no_shallow') + if output_manifest: + cmd.append('--output_manifest') if with_branch_heads or cfg.with_branch_heads: cmd.append('--with_branch_heads') if with_tags: @@ -244,7 +247,7 @@ class BotUpdateApi(recipe_api.RecipeApi): first_sln = cfg.solutions[0].name step_test_data = lambda: self.test_api.output_json( 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. name = 'bot_update' diff --git a/recipes/recipe_modules/bot_update/example.expected/basic.json b/recipes/recipe_modules/bot_update/example.expected/basic.json index 3467f145c..dd7241cb2 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic.json @@ -31,12 +31,6 @@ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"abc\"@@@", "@@@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\": {@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json new file mode 100644 index 000000000..9633a6ad5 --- /dev/null +++ b/recipes/recipe_modules/bot_update/example.expected/basic_output_manifest.json @@ -0,0 +1,117 @@ +[ + { + "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 diff --git a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json index 2306f196e..5171a276d 100644 --- a/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/example.expected/basic_with_branch_heads.json @@ -32,12 +32,6 @@ "@@@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\": {@@@", @@ -72,7 +66,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/buildbot.json b/recipes/recipe_modules/bot_update/example.expected/buildbot.json index 3467f145c..dd7241cb2 100644 --- a/recipes/recipe_modules/bot_update/example.expected/buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/buildbot.json @@ -31,12 +31,6 @@ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"abc\"@@@", "@@@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\": {@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/clobber.json b/recipes/recipe_modules/bot_update/example.expected/clobber.json index 854e9a84c..c90700f14 100644 --- a/recipes/recipe_modules/bot_update/example.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/example.expected/clobber.json @@ -32,12 +32,6 @@ "@@@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\": {@@@", @@ -72,7 +66,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json b/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json index e6fe19013..8863a53ed 100644 --- a/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json +++ b/recipes/recipe_modules/bot_update/example.expected/deprecated_got_revision_mapping.json @@ -37,12 +37,6 @@ "@@@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\": {@@@", @@ -75,7 +69,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json index 192dd78c6..d98e314b4 100644 --- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json +++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_rebase_patch_ref.json @@ -32,12 +32,6 @@ "@@@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\": {@@@", @@ -72,7 +66,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json index 4ebd5d776..9f0915602 100644 --- a/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json +++ b/recipes/recipe_modules/bot_update/example.expected/gerrit_no_reset.json @@ -32,12 +32,6 @@ "@@@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\": {@@@", @@ -72,7 +66,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json index c523d57e6..0c26e5240 100644 --- a/recipes/recipe_modules/bot_update/example.expected/no_shallow.json +++ b/recipes/recipe_modules/bot_update/example.expected/no_shallow.json @@ -32,12 +32,6 @@ "@@@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\": {@@@", @@ -72,7 +66,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json index 9a6535c33..cfc36ea87 100644 --- a/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json +++ b/recipes/recipe_modules/bot_update/example.expected/reset_root_solution_revision.json @@ -31,12 +31,6 @@ "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"revision\"@@@", "@@@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\": {@@@", @@ -71,7 +65,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange.json b/recipes/recipe_modules/bot_update/example.expected/trychange.json index 9654fd9ea..78c6930b5 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange.json @@ -33,12 +33,6 @@ "@@@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\": {@@@", @@ -73,7 +67,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json index fdcf6af8e..89aa34b84 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_buildbot.json @@ -35,12 +35,6 @@ "@@@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\": {@@@", @@ -75,7 +69,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json index c4f1be84c..dda3ee6d4 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json.json @@ -33,12 +33,6 @@ "@@@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\": {@@@", @@ -73,7 +67,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json index e04e202a9..9a997af2e 100644 --- a/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json +++ b/recipes/recipe_modules/bot_update/example.expected/trychange_oauth2_json_win.json @@ -33,12 +33,6 @@ "@@@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\": {@@@", @@ -73,7 +67,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob.json b/recipes/recipe_modules/bot_update/example.expected/tryjob.json index 98132c7a4..80f4d6e07 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob.json @@ -37,12 +37,6 @@ "@@@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\": {@@@", @@ -79,7 +73,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json index 8ca13e573..7c5ccadbd 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail.json @@ -38,12 +38,6 @@ "@@@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\": {@@@", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json index eddd272c8..218fbf326 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json @@ -38,12 +38,6 @@ "@@@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_apply_return_code\": 1, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", @@ -108,7 +102,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json index 0c9497de6..0526c85f3 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json @@ -38,12 +38,6 @@ "@@@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_apply_return_code\": 3, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"src\", @@@", @@ -108,7 +102,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json index ad4307c92..81510290f 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle.json @@ -38,12 +38,6 @@ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"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/third_party/angle\", @@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", @@ -80,7 +74,8 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/third_party/angle@HEAD" + "src/third_party/angle@HEAD", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json index ad4307c92..81510290f 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_gerrit_angle_deprecated.json @@ -38,12 +38,6 @@ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src/third_party/angle\": \"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/third_party/angle\", @@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", @@ -80,7 +74,8 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/third_party/angle@HEAD" + "src/third_party/angle@HEAD", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json index cdff7c4bd..3eaec77cc 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8.json @@ -40,12 +40,6 @@ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"abc\"@@@", "@@@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/v8\", @@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", @@ -84,7 +78,8 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/v8@abc" + "src/v8@abc", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json index 7c78082b3..8dddb5619 100644 --- a/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json @@ -40,12 +40,6 @@ "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"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/v8\", @@@", "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", @@ -84,7 +78,8 @@ "--revision", "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", "--revision", - "src/v8@HEAD" + "src/v8@HEAD", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.expected/with_tags.json b/recipes/recipe_modules/bot_update/example.expected/with_tags.json index 3ce7e07ec..dd017c1ba 100644 --- a/recipes/recipe_modules/bot_update/example.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/example.expected/with_tags.json @@ -32,12 +32,6 @@ "@@@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\": {@@@", @@ -72,7 +66,8 @@ "--output_json", "/path/to/tmp/json", "--revision", - "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9" + "src@f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9", + "--output_manifest" ], "env": { "GIT_HTTP_LOW_SPEED_LIMIT": "1000", diff --git a/recipes/recipe_modules/bot_update/example.py b/recipes/recipe_modules/bot_update/example.py index c0cd3b2f9..4ac935f02 100644 --- a/recipes/recipe_modules/bot_update/example.py +++ b/recipes/recipe_modules/bot_update/example.py @@ -31,6 +31,7 @@ def RunSteps(api): patch = api.properties.get('patch', True) clobber = True if api.properties.get('clobber') 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_tags = api.properties.get('with_tags', False) refs = api.properties.get('refs', []) @@ -53,6 +54,7 @@ def RunSteps(api): patch=patch, with_branch_heads=with_branch_heads, with_tags=with_tags, + output_manifest=output_manifest, refs=refs, patch_oauth2=oauth2, oauth2_json=oauth2_json, clobber=clobber, @@ -78,6 +80,9 @@ def GenTests(api): with_branch_heads=True, 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('tryjob') + api.properties( issue=12345, diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 4b7d12ce9..e420e2e22 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -919,6 +919,8 @@ def parse_args(): 'Can prepend root@ to specify which repository, ' 'where root is either a filesystem path or git https ' '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', help='Delete checkout first, always') parse.add_option('--output_json', @@ -1086,6 +1088,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow): #raise Exception('No got_revision(s) found in gclient output') if options.output_json: + manifest = create_manifest() if options.output_manifest else None # Tell recipes information such as root, got_revision, etc. emit_json(options.output_json, did_run=True, @@ -1094,7 +1097,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow): step_text=step_text, fixed_revisions=revisions, properties=got_revisions, - manifest=create_manifest()) + manifest=manifest) def print_debug_info(): diff --git a/recipes/recipe_modules/bot_update/test_api.py b/recipes/recipe_modules/bot_update/test_api.py index 878a23c02..0547a911a 100644 --- a/recipes/recipe_modules/bot_update/test_api.py +++ b/recipes/recipe_modules/bot_update/test_api.py @@ -9,7 +9,7 @@ from recipe_engine import recipe_test_api class BotUpdateTestApi(recipe_test_api.RecipeTestApi): 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 --output-json option. """ @@ -35,15 +35,16 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi): 'step_text': 'Some step text' }) - output.update({ - 'manifest': { - project_name: { - 'repository': 'https://fake.org/%s.git' % project_name, - 'revision': self.gen_revision(project_name), + if output_manifest: + output.update({ + 'manifest': { + 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: output['fixed_revisions'] = fixed_revisions