diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 6e6bb3679..8499af8b8 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -62,12 +62,12 @@ Recipe module to ensure a checkout is consistent on a bot. Wrapper for easy calling of bot_update. -— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#528)(self, bot_update_step):** +— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#538)(self, bot_update_step):** Deapplies a patch, taking care of DEPS and solution revisions properly. -— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#81)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, clobber=False, root_solution_revision=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, download_topics=False, \*\*kwargs):** +— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#81)(self, gclient_config=None, suffix=None, patch=True, update_presentation=True, patch_root=None, with_branch_heads=False, with_tags=False, no_fetch_tags=False, refs=None, clobber=False, root_solution_revision=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, assert_one_gerrit_change=True, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, download_topics=False, recipe_revision_overrides=None, \*\*kwargs):** Args: * gclient_config: The gclient configuration to use when running bot_update. @@ -97,8 +97,13 @@ Args: via tryserver.set_change() and explicitly set this flag False. * download_topics: If True, gclient downloads and patches locally from all open Gerrit CLs that have the same topic as the tested patch ref. + * recipe_revision_overrides: a dict {deps_name: revision} of revision + overrides passed in from the recipe. These should be revisions unique + to each particular build/recipe run. e.g. the recipe might parse a gerrit + change's commit message to get this revision override requested by the + author. -— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#505)(self, project_name, gclient_config=None):** +— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#515)(self, project_name, gclient_config=None):** Returns all property names used for storing the checked-out revision of a given project. @@ -114,7 +119,7 @@ Returns (list of str): All properties that'll hold the checked-out revision   **@property**
— **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#49)(self):** -— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#456)(self, bot_update_json, name):** +— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#466)(self, bot_update_json, name):** Sets a fixed revision for a single dependency using project revision properties. diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 39b9be075..a902a60cb 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -100,6 +100,7 @@ class BotUpdateApi(recipe_api.RecipeApi): step_test_data=None, enforce_fetch=False, download_topics=False, + recipe_revision_overrides=None, **kwargs): """ Args: @@ -130,6 +131,11 @@ class BotUpdateApi(recipe_api.RecipeApi): via tryserver.set_change() and explicitly set this flag False. * download_topics: If True, gclient downloads and patches locally from all open Gerrit CLs that have the same topic as the tested patch ref. + * recipe_revision_overrides: a dict {deps_name: revision} of revision + overrides passed in from the recipe. These should be revisions unique + to each particular build/recipe run. e.g. the recipe might parse a gerrit + change's commit message to get this revision override requested by the + author. """ assert not (ignore_input_commit and set_output_commit) if assert_one_gerrit_change: @@ -228,6 +234,10 @@ class BotUpdateApi(recipe_api.RecipeApi): # Allow for overrides required to bisect into rolls. revisions.update(self._deps_revision_overrides) + # Set revision overrides passed in from the calling recipe + if recipe_revision_overrides: + revisions.update(recipe_revision_overrides) + # Compute command-line parameters for requested revisions. # Also collect all fixed revisions to simulate them in the json output. # Fixed revision are the explicit input revisions of bot_update.py, i.e. diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json index d8f09b0fe..6f0fc0796 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--revision", "src/v8@HEAD", @@ -53,10 +55,15 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src/v8\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", @@ -85,6 +92,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", @@ -123,7 +136,7 @@ "cmd": [], "name": "set blamelist pins", "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/milo/blamelist_pins@[{\"host\": \"fake.org\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"src\"}, {\"host\": \"fake.org\", \"id\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"project\": \"src/v8\"}]@@@" + "@@@SET_BUILD_PROPERTY@$recipe_engine/milo/blamelist_pins@[{\"host\": \"fake.org\", \"id\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\", \"project\": \"infra\"}, {\"host\": \"fake.org\", \"id\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\", \"project\": \"src\"}, {\"host\": \"fake.org\", \"id\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"project\": \"src/v8\"}]@@@" ] }, { diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json index 07da55b32..2ef5dcb0d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--revision", "src/v8@HEAD", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json index 4db033907..a0753b6ec 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", "refs/heads/main" @@ -51,9 +53,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", @@ -82,6 +89,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json index a0a7bc808..a7de474f1 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", "refs/heads/main", @@ -52,9 +54,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", @@ -83,6 +90,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json index 01c02fc3d..558601e70 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", "refs/heads/main" diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json index 85836e51b..cf332d512 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--clobber" ], @@ -38,9 +40,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -69,6 +76,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json index 1d35cf949..1a0142e86 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/chromium/src@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@refs/heads/main", "--refs", "refs/heads/main" @@ -110,9 +112,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -128,6 +135,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json index 8d2121f72..e50c2e09e 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--gerrit_no_rebase_patch_ref" ], @@ -38,9 +40,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -69,6 +76,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json index 588a4fdda..f0f762404 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--gerrit_no_reset" ], @@ -38,9 +40,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -69,6 +76,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json index feea56f4e..3d22816be 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" ], "env": { @@ -48,9 +50,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\"@@@", @@ -79,6 +86,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json index d9290ef39..389bb6848 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json @@ -19,6 +19,8 @@ "--patch_ref", "https://chromium.googlesource.com/v8/v8@refs/changes/124/45/6", "--revision", + "infra@HEAD", + "--revision", "src@HEAD" ], "env": { @@ -41,9 +43,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -72,6 +79,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json index 54d01af90..2caf3a55f 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--refs", "refs/heads/main" diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json index 4dd8d94d6..ab79a1658 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@refs/branch-heads/x", "--refs", "refs/branch-heads/x" diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json index 672c98686..3840da619 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "--refs", "refs/heads/main" diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json index 518389172..9947f24b3 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@refs/heads/main", "--refs", "refs/heads/main" diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json b/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json index c45333835..2d31ad38a 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@origin/main", "--refs", "refs/heads/main" @@ -51,9 +53,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"origin/main\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"4f42efcc5ba75e72423a01129d981345f480eb09\"@@@", @@ -82,6 +89,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json index 94bf91c29..6ed7d1f96 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--refs", "+refs/change/1/2/333" @@ -39,9 +41,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -70,6 +77,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json index 3bae56478..bf0268096 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322" ], "env": { @@ -37,9 +39,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322\"@@@", @@ -68,6 +75,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json index 4db033907..a0753b6ec 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@2d72510e447ab60a9728aeea2362d8be2cbd7789", "--refs", "refs/heads/main" @@ -51,9 +53,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"2d72510e447ab60a9728aeea2362d8be2cbd7789\"@@@", @@ -82,6 +89,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json index 0863bbabc..0820fe792 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json @@ -14,6 +14,8 @@ "[CLEANUP]/bot_update", "--output_json", "/path/to/tmp/json", + "--revision", + "infra@HEAD", "--refs", "refs/heads/main" ], diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json b/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json index 48992db62..bd07c4ed6 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@refs/branch-heads/4000", "--refs", "refs/heads/main", @@ -53,9 +55,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"refs/branch-heads/4000\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"b1825ff1db515074bd95da238f5d297740c2aad1\"@@@", @@ -84,6 +91,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json index 08be6d4ac..ac36de1d9 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/chromium/src@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@refs/heads/main", "--refs", "refs/heads/main" diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json index 264c14c13..c2c27bd2d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/chromium/src@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@refs/heads/main", "--refs", "refs/heads/main" @@ -111,9 +113,14 @@ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"failed_patch_body\": \"Downloading patch...\\nApplying the patch...\\nPatch: foo/bar.py\\nIndex: foo/bar.py\\ndiff --git a/foo/bar.py b/foo/bar.py\\nindex HASH..HASH MODE\\n--- a/foo/bar.py\\n+++ b/foo/bar.py\\ncontext\\n+something\\n-something\\nmore context\", @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -143,6 +150,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json index 1b4df63af..fcbf64506 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/chromium/src@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@refs/heads/main", "--refs", "refs/heads/main" @@ -111,9 +113,14 @@ "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@", "@@@STEP_LOG_LINE@json.output@ \"failed_patch_body\": \"Downloading patch...\\nApplying the patch...\\nPatch: foo/bar.py\\nIndex: foo/bar.py\\ndiff --git a/foo/bar.py b/foo/bar.py\\nindex HASH..HASH MODE\\n--- a/foo/bar.py\\n+++ b/foo/bar.py\\ncontext\\n+something\\n-something\\nmore context\", @@@", "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -143,6 +150,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json index 5544a605b..47b42cdb8 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/angle/angle@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--revision", "src/third_party/angle@refs/heads/main" @@ -110,10 +112,15 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@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@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -142,6 +149,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json index f285e2dac..55646dc9d 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/chromium/src@refs/branch-heads/67:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@refs/branch-heads/67", "--refs", "refs/branch-heads/67" @@ -110,9 +112,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -141,6 +148,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json index f97eae888..7b434eeb4 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/chromium/src@refs/heads/experimental/feature:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@refs/heads/experimental/feature", "--refs", "refs/heads/experimental/feature" @@ -110,9 +112,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -141,6 +148,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json index 98c448eb6..bbc6b6398 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/v8/v8@refs/heads/experimental/feature:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--revision", "src/v8@refs/heads/experimental/feature" @@ -110,10 +112,15 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@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@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -142,6 +149,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json index cb2b0adae..bfb3fd2d7 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json @@ -74,6 +74,8 @@ "--patch_ref", "https://webrtc.googlesource.com/src@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--revision", "src/third_party/webrtc@refs/heads/main" @@ -110,10 +112,15 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src/third_party/webrtc\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -146,6 +153,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json index c8bada54b..0485ffc6a 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/v8/v8@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--revision", "src/v8@abc" @@ -110,10 +112,15 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@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@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -142,6 +149,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json index e34e9d66d..a70e02298 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json @@ -74,6 +74,8 @@ "--patch_ref", "https://chromium.googlesource.com/v8/v8@refs/heads/main:refs/changes/56/123456/7", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--revision", "src/v8@refs/heads/main" @@ -110,10 +112,15 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@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@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -142,6 +149,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json index fb4e15655..6c4e77855 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--experiments=no_sync,cool_experiment" ], @@ -38,9 +40,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -69,6 +76,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json index 502f4beea..971849c23 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json @@ -15,6 +15,8 @@ "--output_json", "/path/to/tmp/json", "--revision", + "infra@HEAD", + "--revision", "src@HEAD", "--with_tags" ], @@ -38,9 +40,14 @@ "@@@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@ \"infra\": \"HEAD\", @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": \"HEAD\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@", "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@", @@ -69,6 +76,12 @@ "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@", "@@@STEP_LOG_LINE@json.output@ \"source_manifest\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"directories\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/infra.git\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"revision\": \"5e03a58dc0850e5137a8ebbce29610670c756aed\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"git_checkout\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"repo_url\": \"https://fake.org/src.git\", @@@", diff --git a/recipes/recipe_modules/bot_update/examples/full.py b/recipes/recipe_modules/bot_update/examples/full.py index ec01949c2..bb6ecf31e 100644 --- a/recipes/recipe_modules/bot_update/examples/full.py +++ b/recipes/recipe_modules/bot_update/examples/full.py @@ -71,6 +71,7 @@ def RunSteps(api): bot_update_output = engine_types.thaw(api.properties.get('bot_update_output')) if bot_update_output: step_test_data = lambda: api.json.test_api.output(bot_update_output) + rev_overrides = {'infra': 'HEAD'} bot_update_step = api.bot_update.ensure_checkout( patch=patch, with_branch_heads=with_branch_heads, @@ -85,7 +86,8 @@ def RunSteps(api): add_blamelists=add_blamelists, set_output_commit=set_output_commit, step_test_data=step_test_data, - ) + recipe_revision_overrides=rev_overrides, + ) if patch: api.bot_update.deapply_patch(bot_update_step)