From 98218e9219b11e9681420b7a61e126bdb6fafec3 Mon Sep 17 00:00:00 2001 From: Stephanie Kim Date: Thu, 1 Oct 2020 17:17:57 +0000 Subject: [PATCH] Revert "Add optional enforce_fetch kwarg to fetch and refresh git cache" This reverts commit f38f54f2f1a3121643d86abab9e6ebe597238d9b. Reason for revert: Seeing errors about missing args https://logs.chromium.org/logs/chromium/led/infra-try-recipes-tester_chops-service-accounts.iam.gserviceaccount.com/007f2e16447b70ae83e87835e2586d4b032f1a915872d9237cec0f72bb239fd6/+/steps/bot_update/0/stdout Original change's description: > Add optional enforce_fetch kwarg to fetch and refresh git cache > > Allows builders to do a force refresh of the git cache to ensure a new > fetch happens. android-binary-size needs this to get an accurate diff > of the passed in src revision and the applied patch: > https://bugs.chromium.org/p/chromium/issues/detail?id=1129235#c19 > > Bug: 1129235 > Change-Id: I993521cdde2a491fc9d42d75ff28dedcd2cea64e > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2438802 > Commit-Queue: Stephanie Kim > Reviewed-by: Josip Sokcevic TBR=tandrii@google.com,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com,kimstephanie@google.com Change-Id: Ib867742c624f085d3dd56422c2d63c15fdc84f06 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 1129235 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2443231 Reviewed-by: Stephanie Kim Commit-Queue: Stephanie Kim --- recipes/README.recipes.md | 10 ++++------ recipes/recipe_modules/bot_update/api.py | 3 --- .../bot_update/resources/bot_update.py | 13 +++++-------- tests/bot_update_coverage_test.py | 1 - 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/recipes/README.recipes.md b/recipes/README.recipes.md index be75c48e88..40a81fede6 100644 --- a/recipes/README.recipes.md +++ b/recipes/README.recipes.md @@ -58,12 +58,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#522)(self, bot_update_step):** +— **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#519)(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#76)(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, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, enforce_fetch=False, \*\*kwargs):** +— **def [ensure\_checkout](/recipes/recipe_modules/bot_update/api.py#76)(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, patch_oauth2=None, oauth2_json=None, use_site_config_creds=None, clobber=False, root_solution_revision=None, rietveld=None, issue=None, patchset=None, gerrit_no_reset=False, gerrit_no_rebase_patch_ref=False, disable_syntax_validation=False, patch_refs=None, ignore_input_commit=False, add_blamelists=False, set_output_commit=False, step_test_data=None, \*\*kwargs):** Args: gclient_config: The gclient configuration to use when running bot_update. @@ -88,10 +88,8 @@ Args: Requires falsy ignore_input_commit. step_test_data: a null function that returns test bot_update.py output. Use test_api.output_json to generate test data. - enforce_fetch: Enforce a new fetch to refresh the git cache, even if the - solution revision passed in already exists in the current git cache. -— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#499)(self, project_name, gclient_config=None):** +— **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#496)(self, project_name, gclient_config=None):** Returns all property names used for storing the checked-out revision of a given project. @@ -109,7 +107,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#44)(self):** -— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#449)(self, bot_update_json, name):** +— **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#446)(self, bot_update_json, name):** Set 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 ffa426bddb..03af60df5c 100644 --- a/recipes/recipe_modules/bot_update/api.py +++ b/recipes/recipe_modules/bot_update/api.py @@ -99,7 +99,6 @@ class BotUpdateApi(recipe_api.RecipeApi): add_blamelists=False, set_output_commit=False, step_test_data=None, - enforce_fetch=False, **kwargs): """ Args: @@ -125,8 +124,6 @@ class BotUpdateApi(recipe_api.RecipeApi): Requires falsy ignore_input_commit. step_test_data: a null function that returns test bot_update.py output. Use test_api.output_json to generate test data. - enforce_fetch: Enforce a new fetch to refresh the git cache, even if the - solution revision passed in already exists in the current git cache. """ assert use_site_config_creds is None, "use_site_config_creds is deprecated" assert rietveld is None, "rietveld is deprecated" diff --git a/recipes/recipe_modules/bot_update/resources/bot_update.py b/recipes/recipe_modules/bot_update/resources/bot_update.py index ca37fb5bb4..96b7248ff4 100755 --- a/recipes/recipe_modules/bot_update/resources/bot_update.py +++ b/recipes/recipe_modules/bot_update/resources/bot_update.py @@ -678,13 +678,13 @@ def _maybe_break_locks(checkout_path, tries=3): def git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir, - cleanup_dir, enforce_fetch): + cleanup_dir): build_dir = os.getcwd() first_solution = True for sln in solutions: sln_dir = path.join(build_dir, sln['name']) _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir, - cleanup_dir, enforce_fetch) + cleanup_dir) if first_solution: git_ref = git('log', '--format=%H', '--max-count=1', cwd=path.join(build_dir, sln['name']) @@ -694,7 +694,7 @@ def git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir, def _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir, - cleanup_dir, enforce_fetch): + cleanup_dir): name = sln['name'] url = sln['url'] populate_cmd = (['cache', 'populate', '--ignore_locks', '-v', @@ -715,9 +715,6 @@ def _git_checkout(sln, sln_dir, revisions, refs, no_fetch_tags, git_cache_dir, branch, revision = get_target_branch_and_revision(name, url, revisions) pin = revision if COMMIT_HASH_RE.match(revision) else None - if enforce_fetch: - git(*populate_cmd, env=env) - # Step 1: populate/refresh cache, if necessary. if not pin: # Refresh only once. @@ -867,14 +864,14 @@ def emit_json(out_file, did_run, gclient_output=None, **kwargs): def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only, target_cpu, patch_root, patch_refs, gerrit_rebase_patch_ref, no_fetch_tags, refs, git_cache_dir, cleanup_dir, - gerrit_reset, disable_syntax_validation, enforce_fetch): + gerrit_reset, disable_syntax_validation): # Get a checkout of each solution, without DEPS or hooks. # Calling git directly because there is no way to run Gclient without # invoking DEPS. print('Fetching Git checkout') git_checkouts(solutions, revisions, refs, no_fetch_tags, git_cache_dir, - cleanup_dir, enforce_fetch) + cleanup_dir) # Ensure our build/ directory is set up with the correct .gclient file. gclient_configure(solutions, target_os, target_os_only, target_cpu, diff --git a/tests/bot_update_coverage_test.py b/tests/bot_update_coverage_test.py index a3dbba653a..ecac91a755 100755 --- a/tests/bot_update_coverage_test.py +++ b/tests/bot_update_coverage_test.py @@ -157,7 +157,6 @@ class BotUpdateUnittests(unittest.TestCase): 'cleanup_dir': None, 'gerrit_reset': None, 'disable_syntax_validation': False, - 'enforce_fetch': False, } def setUp(self):