From 43d72759fed16f6666fa08efb54400ff7887fd9e Mon Sep 17 00:00:00 2001 From: Stephen Martinis Date: Mon, 30 Apr 2018 23:00:35 +0000 Subject: [PATCH] Revert "bot_update: Set user.{name,email} when applying patch refs." This reverts commit e86fe982e811360b8e9dcb3688c543efd153fff4. Reason for revert: Probably causing outages on win7_chromium_rel_ng. Original change's description: > bot_update: Set user.{name,email} when applying patch refs. > > git rebase complains when user name/email has not been configured, as was > the case for the Chromium trybot. > > Bug: 643346 > Change-Id: Iab7dac0a98608e09b63a53d5bacb98925701fbfd > Reviewed-on: https://chromium-review.googlesource.com/1031524 > Reviewed-by: Aaron Gable > Commit-Queue: Edward Lesmes TBR=agable@chromium.org,ehmaldonado@chromium.org Change-Id: Ic57398323476fccef34f766270d760c3975630a6 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 643346 Reviewed-on: https://chromium-review.googlesource.com/1036308 Reviewed-by: Stephen Martinis Commit-Queue: Stephen Martinis --- recipes/recipe_modules/bot_update/resources/bot_update.py | 5 ----- recipes/trigger_recipe_roller.txt | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index 6d56d8a6c..3e5361875 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -339,11 +339,6 @@ def gclient_sync( fd, gclient_output_file = tempfile.mkstemp(suffix='.json') os.close(fd) - # Some bots don't have git user name/email configured, which causes problems - # when rebasing. - git('config', 'user.name', 'chrome-bot') - git('config', 'user.email', 'chrome-bot@chromium.org') - args = ['sync', '--verbose', '--reset', '--force', '--ignore_locks', '--output-json', gclient_output_file, '--nohooks', '--noprehooks', '--delete_unversioned_trees'] diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt index a814237e3..c190de528 100644 --- a/recipes/trigger_recipe_roller.txt +++ b/recipes/trigger_recipe_roller.txt @@ -1,4 +1,4 @@ -No-op file. Edit this to kick recipes. +No-op file. Edit this to kick recipes. (Did they do something wrong?) This is a beginning of a story in this silly file. Once upon a time, a budding web browser dev team needed a CI system.