From 5c2d472e0c90d3abe39ff340403d7f07e109b53b Mon Sep 17 00:00:00 2001 From: Jack Neus Date: Thu, 7 Apr 2022 18:35:25 +0000 Subject: [PATCH] Revert "bot_update: change set_output_commit to True by default" This reverts commit ffeef9001edb33e16e6a72db746cdb8d2cf6c568. Reason for revert: Breaks ChromeOS builders, e.g. go/bbid/8817528282713702353 Original change's description: > bot_update: change set_output_commit to True by default > > This is for https://crbug.com/1310066#c7 > > Bug: 1310066 > Change-Id: I874e1a4c2ca53a7da04d6c24533429d7508088a8 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3565259 > Reviewed-by: Robbie Iannucci > Reviewed-by: Josip Sokcevic > Commit-Queue: Takuto Ikuta > Auto-Submit: Takuto Ikuta Recipe-Nontrivial-Roll: infra Recipe-Nontrivial-Roll: build_limited Recipe-Nontrivial-Roll: build Bug: 1310066 Change-Id: Id6b32f71ba8824ad3e748d0b52603ea1548096e5 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3575359 Bot-Commit: Rubber Stamper Reviewed-by: Robbie Iannucci Reviewed-by: Garrett Beaty Owners-Override: Ben Pastene Reviewed-by: Josip Sokcevic Commit-Queue: Robbie Iannucci --- recipes/README.recipes.md | 2 +- recipes/recipe_modules/bot_update/api.py | 2 +- .../bot_update/examples/full.expected/clobber.json | 7 ------- .../examples/full.expected/gerrit_no_rebase_patch_ref.json | 7 ------- .../bot_update/examples/full.expected/gerrit_no_reset.json | 7 ------- .../full.expected/input_commit_with_id_without_repo.json | 7 ------- .../examples/full.expected/multiple_patch_refs.json | 7 ------- .../examples/full.expected/no_apply_patch_on_gclient.json | 7 ------- .../bot_update/examples/full.expected/refs.json | 7 ------- .../full.expected/reset_root_solution_revision.json | 7 ------- .../examples/full.expected/tryjob_gerrit_angle.json | 7 ------- .../examples/full.expected/tryjob_gerrit_branch_heads.json | 7 ------- .../full.expected/tryjob_gerrit_feature_branch.json | 7 ------- .../full.expected/tryjob_gerrit_v8_feature_branch.json | 7 ------- .../examples/full.expected/tryjob_gerrit_webrtc.json | 7 ------- .../bot_update/examples/full.expected/tryjob_v8.json | 7 ------- .../examples/full.expected/tryjob_v8_head_by_default.json | 7 ------- .../examples/full.expected/with_experiments.json | 7 ------- .../bot_update/examples/full.expected/with_tags.json | 7 ------- 19 files changed, 2 insertions(+), 121 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 838e567ec..b47e16d24 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -64,7 +64,7 @@ Wrapper for easy calling of bot_update. 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=True, step_test_data=None, enforce_fetch=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, \*\*kwargs):** Args: * gclient_config: The gclient configuration to use when running bot_update. diff --git a/recipes/recipe_modules/bot_update/api.py b/recipes/recipe_modules/bot_update/api.py index 21e5e390c..4a3cfbd50 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -96,7 +96,7 @@ class BotUpdateApi(recipe_api.RecipeApi): patch_refs=None, ignore_input_commit=False, add_blamelists=False, - set_output_commit=True, + set_output_commit=False, step_test_data=None, enforce_fetch=False, **kwargs): 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 76c7dd080..85836e51b 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/clobber.json @@ -206,13 +206,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 d4cd50a0d..8d2121f72 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 @@ -206,13 +206,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 80c5a82dc..588a4fdda 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 @@ -206,13 +206,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 07e5032a6..feea56f4e 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 @@ -227,13 +227,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 f1ed17fa4..d9290ef39 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 @@ -209,13 +209,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } diff --git a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json index d1c10b27e..2530ac743 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json @@ -296,13 +296,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 6bac4217d..94bf91c29 100644 --- a/recipes/recipe_modules/bot_update/examples/full.expected/refs.json +++ b/recipes/recipe_modules/bot_update/examples/full.expected/refs.json @@ -207,13 +207,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 b2bbda6c6..3bae56478 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 @@ -205,13 +205,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 d1c10b27e..2530ac743 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 @@ -296,13 +296,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 407126237..e66b6cbd7 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 @@ -292,13 +292,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 b8e978ca5..690f046fa 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 @@ -292,13 +292,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 d83dd3f68..928e1ceba 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 @@ -296,13 +296,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 302da2331..732942b28 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 @@ -316,13 +316,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 c8d4354f4..6240d43e2 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 @@ -296,13 +296,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 41ed7dd9b..062ea61d6 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 @@ -296,13 +296,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 46b624516..fb4e15655 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 @@ -207,13 +207,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" } 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 ba3b687f1..502f4beea 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 @@ -206,13 +206,6 @@ "@@@STEP_LOG_END@json.output@@@" ] }, - { - "cmd": [], - "name": "set_output_gitiles_commit (2)", - "~followup_annotations": [ - "@@@SET_BUILD_PROPERTY@$recipe_engine/buildbucket/output_gitiles_commit@{\"host\": \"fake.org\", \"id\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"position\": 170242, \"project\": \"src\", \"ref\": \"refs/heads/main\"}@@@" - ] - }, { "name": "$result" }