Skip to content

C
Chromium_Depot_tools
Commit 289dedd3 authored by Josip Sokcevic's avatar Josip Sokcevic Committed by LUCI CQ
Browse files
Options

Remove unused arguments from bot_update recipe 

gclient removed syntax validation flag in 2020:
https://crrev.com/c/2083589, so this can safely be removed.

R=aravindvasudev@google.com, gavinmak@google.com

Recipe-Nontrivial-Roll: chrome_release
Recipe-Nontrivial-Roll: build_limited
Recipe-Nontrivial-Roll: build
Change-Id: I2aced6cdb01d571ca361cc57e7c8715c9ca40552
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3419278Reviewed-by: 's avatarGavin Mak <gavinmak@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
parent 925f2fa4
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 89 deletions
recipes/README.recipes.md
View file @ 289dedd3
......@@ -58,12 +58,12 @@ Recipe module to ensure a checkout is consistent on a bot.
Wrapper for easy calling of bot_update.
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#522)(self, bot_update_step):**
&mdash; **def [deapply\_patch](/recipes/recipe_modules/bot_update/api.py#516)(self, bot_update_step):**
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, 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):**
&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.
......@@ -72,9 +72,6 @@ Args:
fetch any tags referenced from the references being fetched. When a repo
has many references, it can become a performance bottleneck, so avoid
tags if the checkout will not need them present.
* disable_syntax_validation: (legacy) Disables syntax validation for DEPS.
Needed as migration paths for recipes dealing with older revisions,
such as bisect.
* ignore_input_commit: if True, ignore api.buildbucket.gitiles_commit.
Exists for historical reasons. Please do not use.
* add_blamelists: if True, add blamelist pins for all of the repos that had
......@@ -95,7 +92,7 @@ Args:
bot_update module ONLY supports one change. Users may specify a change
via tryserver.set_change() and explicitly set this flag False.
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#499)(self, project_name, gclient_config=None):**
&mdash; **def [get\_project\_revision\_properties](/recipes/recipe_modules/bot_update/api.py#493)(self, project_name, gclient_config=None):**
Returns all property names used for storing the checked-out revision of
a given project.
......@@ -111,7 +108,7 @@ Returns (list of str): All properties that'll hold the checked-out revision
&emsp; **@property**<br>&mdash; **def [last\_returned\_properties](/recipes/recipe_modules/bot_update/api.py#49)(self):**
&mdash; **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#450)(self, bot_update_json, name):**
&mdash; **def [resolve\_fixed\_revision](/recipes/recipe_modules/bot_update/api.py#444)(self, bot_update_json, name):**
Sets a fixed revision for a single dependency using project revision
properties.
......@@ -1013,7 +1010,7 @@ PYTHON_VERSION_COMPATIBILITY: PY2+3
PYTHON_VERSION_COMPATIBILITY: PY2+3
&mdash; **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#67)(api):**
&mdash; **def [RunSteps](/recipes/recipe_modules/gclient/examples/full.py#66)(api):**
### *recipes* / [gclient:tests/diff\_deps](/recipes/recipe_modules/gclient/tests/diff_deps.py)
[DEPS](/recipes/recipe_modules/gclient/tests/diff_deps.py#9): [gclient](#recipe_modules-gclient), [recipe\_engine/assertions][recipe_engine/recipe_modules/assertions], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io]
......
recipes/recipe_modules/bot_update/api.py
View file @ 289dedd3
......@@ -93,7 +93,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
gerrit_no_reset=False,
gerrit_no_rebase_patch_ref=False,
assert_one_gerrit_change=True,
disable_syntax_validation=False,
patch_refs=None,
ignore_input_commit=False,
add_blamelists=False,
......@@ -109,9 +108,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
fetch any tags referenced from the references being fetched. When a repo
has many references, it can become a performance bottleneck, so avoid
tags if the checkout will not need them present.
* disable_syntax_validation: (legacy) Disables syntax validation for DEPS.
Needed as migration paths for recipes dealing with older revisions,
such as bisect.
* ignore_input_commit: if True, ignore api.buildbucket.gitiles_commit.
Exists for historical reasons. Please do not use.
* add_blamelists: if True, add blamelist pins for all of the repos that had
......@@ -284,8 +280,6 @@ class BotUpdateApi(recipe_api.RecipeApi):
cmd.append('--no_fetch_tags')
if gerrit_no_rebase_patch_ref:
cmd.append('--gerrit_no_rebase_patch_ref')
if disable_syntax_validation or cfg.disable_syntax_validation:
cmd.append('--disable-syntax-validation')
if self.m.properties.get('bot_update_experiments'):
cmd.append('--experiments=%s' %
','.join(self.m.properties['bot_update_experiments']))
......
recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists.json
View file @ 289dedd3
......@@ -19,8 +19,7 @@
"--revision",
"src/v8@HEAD",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/add_blamelists_bot_update_failure.json
View file @ 289dedd3
......@@ -19,8 +19,7 @@
"--revision",
"src/v8@HEAD",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/basic.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/basic_with_branch_heads.json
View file @ 289dedd3
......@@ -18,8 +18,7 @@
"src@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
"refs/heads/main",
"--with_branch_heads",
"--disable-syntax-validation"
"--with_branch_heads"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/bot_update_failure.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/clobber.json
View file @ 289dedd3
......@@ -16,8 +16,7 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--clobber",
"--disable-syntax-validation"
"--clobber"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/deprecated_got_revision_mapping.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@refs/heads/main",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_rebase_patch_ref.json
View file @ 289dedd3
......@@ -16,8 +16,7 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--gerrit_no_rebase_patch_ref",
"--disable-syntax-validation"
"--gerrit_no_rebase_patch_ref"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/gerrit_no_reset.json
View file @ 289dedd3
......@@ -16,8 +16,7 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--gerrit_no_reset",
"--disable-syntax-validation"
"--gerrit_no_reset"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/input_commit_with_id_without_repo.json
View file @ 289dedd3
......@@ -15,8 +15,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"--disable-syntax-validation"
"src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/multiple_patch_refs.json
View file @ 289dedd3
......@@ -19,8 +19,7 @@
"--patch_ref",
"https://chromium.googlesource.com/v8/v8@refs/changes/124/45/6",
"--revision",
"src@HEAD",
"--disable-syntax-validation"
"src@HEAD"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_apply_patch_on_gclient.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@HEAD",
"--revision",
"src/third_party/angle@refs/heads/main",
"--disable-syntax-validation"
"src/third_party/angle@refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_HEAD.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@HEAD",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_branch_head.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@refs/branch-heads/x",
"--refs",
"refs/branch-heads/x",
"--disable-syntax-validation"
"refs/branch-heads/x"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_a_specific_commit.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/no_cp_checkout_main.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@refs/heads/main",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/origin_main.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@origin/main",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/refs.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@HEAD",
"--refs",
"+refs/change/1/2/333",
"--disable-syntax-validation"
"+refs/change/1/2/333"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/reset_root_solution_revision.json
View file @ 289dedd3
......@@ -15,8 +15,7 @@
"--output_json",
"/path/to/tmp/json",
"--revision",
"src@b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322",
"--disable-syntax-validation"
"src@b0ff6a5b8b2bd8a31e9b5e29710da5275f0a9322"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.expected/resolve_chromium_fixed_version.json
View file @ 289dedd3
......@@ -17,8 +17,7 @@
"--revision",
"src@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/revision_fallback_chain_set_output_commit.json
View file @ 289dedd3
......@@ -15,8 +15,7 @@
"--output_json",
"/path/to/tmp/json",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/revision_specifying_ref.json
View file @ 289dedd3
......@@ -19,8 +19,7 @@
"--refs",
"refs/heads/main",
"--refs",
"refs/branch-heads/4000",
"--disable-syntax-validation"
"refs/branch-heads/4000"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/ci/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@refs/heads/main",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@refs/heads/main",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@refs/heads/main",
"--refs",
"refs/heads/main",
"--disable-syntax-validation"
"refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@HEAD",
"--revision",
"src/third_party/angle@refs/heads/main",
"--disable-syntax-validation"
"src/third_party/angle@refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_branch_heads.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@refs/branch-heads/67",
"--refs",
"refs/branch-heads/67",
"--disable-syntax-validation"
"refs/branch-heads/67"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_feature_branch.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@refs/heads/experimental/feature",
"--refs",
"refs/heads/experimental/feature",
"--disable-syntax-validation"
"refs/heads/experimental/feature"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_v8_feature_branch.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@HEAD",
"--revision",
"src/v8@refs/heads/experimental/feature",
"--disable-syntax-validation"
"src/v8@refs/heads/experimental/feature"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_webrtc.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@HEAD",
"--revision",
"src/third_party/webrtc@refs/heads/main",
"--disable-syntax-validation"
"src/third_party/webrtc@refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@HEAD",
"--revision",
"src/v8@abc",
"--disable-syntax-validation"
"src/v8@abc"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json
View file @ 289dedd3
......@@ -76,8 +76,7 @@
"--revision",
"src@HEAD",
"--revision",
"src/v8@refs/heads/main",
"--disable-syntax-validation"
"src/v8@refs/heads/main"
],
"env": {
"DEPOT_TOOLS_REPORT_BUILD": "chromium/src/try/linux/8945511751514863184",
......
recipes/recipe_modules/bot_update/examples/full.expected/with_experiments.json
View file @ 289dedd3
......@@ -16,7 +16,6 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--disable-syntax-validation",
"--experiments=no_sync,cool_experiment"
],
"env": {
......
recipes/recipe_modules/bot_update/examples/full.expected/with_tags.json
View file @ 289dedd3
......@@ -16,8 +16,7 @@
"/path/to/tmp/json",
"--revision",
"src@HEAD",
"--with_tags",
"--disable-syntax-validation"
"--with_tags"
],
"env": {
"DEPOT_TOOLS_COLLECT_METRICS": "0",
......
recipes/recipe_modules/bot_update/examples/full.py
View file @ 289dedd3
......@@ -79,7 +79,6 @@ def RunSteps(api):
suffix=suffix,
gerrit_no_reset=gerrit_no_reset,
gerrit_no_rebase_patch_ref=gerrit_no_rebase_patch_ref,
disable_syntax_validation=True,
patch_refs=patch_refs,
add_blamelists=add_blamelists,
set_output_commit=set_output_commit,
......
recipes/recipe_modules/gclient/config.py
View file @ 289dedd3
......@@ -104,8 +104,6 @@ def BaseConfig(USE_MIRROR=True, CACHE_DIR=None,
required=False,
hidden=True),
disable_syntax_validation = Single(bool, empty_val=False, required=False),
USE_MIRROR = Static(bool(USE_MIRROR)),
BUILDSPEC_VERSION= Static(BUILDSPEC_VERSION, hidden=True),
)
......@@ -119,10 +117,6 @@ def ChromiumGitURL(_c, *pieces):
def ChromeInternalGitURL(_c, *pieces): # pragma: no cover
return '/'.join(('https://chrome-internal.googlesource.com',) + pieces)
@config_ctx()
def disable_syntax_validation(c):
c.disable_syntax_validation = True
@config_ctx()
def android(c):
c.target_os.add('android')
......
recipes/recipe_modules/gclient/examples/full.py
View file @ 289dedd3
......@@ -25,7 +25,6 @@ TEST_CONFIGS = [
'custom_tabs_client',
'dart',
'dawn',
'disable_syntax_validation',
'emscripten_releases',
'expect_tests',
'gerrit',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment