From fb9c1110ef1460f5dbb3cb57cce3fc6f977abcff Mon Sep 17 00:00:00 2001 From: Ben Pastene Date: Wed, 5 Aug 2020 19:36:05 +0000 Subject: [PATCH] Revert "ResultDB reporting for bot-triggered builds" This reverts commit bd650534901287e571bec70afeb36e17402efddc. Reason for revert: "flag provided but not defined: -u" https://crbug.com/1113350 Original change's description: > ResultDB reporting for bot-triggered builds > > Recipe-Nontrivial-Roll: build > Change-Id: Id062a66c8a37aeedc85eaa16b1aa1eea4304f5c8 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2330655 > Reviewed-by: Garrett Beaty > Reviewed-by: Edward Lesmes > Reviewed-by: Nodir Turakulov > Commit-Queue: Saagar Sanghavi TBR=nodir@chromium.org,estaab@chromium.org,ehmaldonado@chromium.org,gbeaty@chromium.org,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,saagarsanghavi@google.com Bug: 1113350 Change-Id: I2c496d6c170a2ffb9226c5bb201d467f5847de6a No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2340035 Reviewed-by: Ben Pastene Commit-Queue: Ben Pastene --- recipes/README.recipes.md | 7 +++---- recipes/recipe_modules/presubmit/__init__.py | 1 - recipes/recipe_modules/presubmit/api.py | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index 561cb2a92..88b938194 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -743,7 +743,7 @@ Raises: — **def [initialize](/recipes/recipe_modules/osx_sdk/api.py#46)(self):** ### *recipe_modules* / [presubmit](/recipes/recipe_modules/presubmit) -[DEPS](/recipes/recipe_modules/presubmit/__init__.py#11): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cq][recipe_engine/recipe_modules/cq], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/resultdb][recipe_engine/recipe_modules/resultdb], [recipe\_engine/step][recipe_engine/recipe_modules/step] +[DEPS](/recipes/recipe_modules/presubmit/__init__.py#11): [bot\_update](#recipe_modules-bot_update), [depot\_tools](#recipe_modules-depot_tools), [gclient](#recipe_modules-gclient), [git](#recipe_modules-git), [tryserver](#recipe_modules-tryserver), [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/cq][recipe_engine/recipe_modules/cq], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step] #### **class [PresubmitApi](/recipes/recipe_modules/presubmit/api.py#16)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -751,7 +751,7 @@ Raises: Return a presubmit step. -— **def [execute](/recipes/recipe_modules/presubmit/api.py#79)(self, bot_update_step, skip_owners=False):** +— **def [execute](/recipes/recipe_modules/presubmit/api.py#77)(self, bot_update_step, skip_owners=False):** Runs presubmit and sets summary markdown if applicable. @@ -761,7 +761,7 @@ Args: Returns: a RawResult object, suitable for being returned from RunSteps. -— **def [prepare](/recipes/recipe_modules/presubmit/api.py#43)(self):** +— **def [prepare](/recipes/recipe_modules/presubmit/api.py#41)(self):** Set up a presubmit run. @@ -1075,7 +1075,6 @@ Move things around in a loop! [recipe_engine/recipe_modules/properties]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-properties [recipe_engine/recipe_modules/python]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-python [recipe_engine/recipe_modules/raw_io]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-raw_io -[recipe_engine/recipe_modules/resultdb]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-resultdb [recipe_engine/recipe_modules/runtime]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-runtime [recipe_engine/recipe_modules/step]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-step [recipe_engine/recipe_modules/url]: https://chromium.googlesource.com/infra/luci/recipes-py.git/+/5d50d5f744305222468fed128a8b369ce873ce19/README.recipes.md#recipe_modules-url diff --git a/recipes/recipe_modules/presubmit/__init__.py b/recipes/recipe_modules/presubmit/__init__.py index abd8fde69..233484bb1 100644 --- a/recipes/recipe_modules/presubmit/__init__.py +++ b/recipes/recipe_modules/presubmit/__init__.py @@ -20,7 +20,6 @@ DEPS = [ 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/step', - 'recipe_engine/resultdb', 'tryserver', ] diff --git a/recipes/recipe_modules/presubmit/api.py b/recipes/recipe_modules/presubmit/api.py index 576c420dd..ec7b16c3c 100644 --- a/recipes/recipe_modules/presubmit/api.py +++ b/recipes/recipe_modules/presubmit/api.py @@ -34,8 +34,6 @@ class PresubmitApi(recipe_api.RecipeApi): presubmit_args = list(args) + [ '--json_output', self.m.json.output(), ] - if self.m.resultdb.enabled: - kwargs['wrapper'] = ('rdb', 'stream') step_data = self.m.python( name, self.presubmit_support_path, presubmit_args, **kwargs) return step_data.json.output