Revert "bot_update: change set_output_commit to True by default"

This reverts commit ffeef9001e. 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 <iannucci@chromium.org> > Reviewed-by: Josip Sokcevic <sokcevic@google.com> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > Auto-Submit: Takuto Ikuta <tikuta@chromium.org> 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 <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Robbie Iannucci <iannucci@chromium.org> Reviewed-by: Garrett Beaty <gbeaty@google.com> Owners-Override: Ben Pastene <bpastene@chromium.org> Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Robbie Iannucci <iannucci@chromium.org>
3 years ago · 5c2d472e0c
parent 8798f68bab
commit 5c2d472e0c
19 changed files with 2 additions and 121 deletions
--- 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.
    

-&mdash; **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):**
+&mdash; **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.
--- 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):
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }
--- 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"
  }