Remove the swarming_default_priority field from BotSpec.
Bug: 1131163
Change-Id: Icc0ff963f07617e8a649ff5ef5a925b5365d4507
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/build/+/2429603
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Commit-Queue: Garrett Beaty <gbeaty@chromium.org>
diff --git a/recipes/recipe_modules/chromium_tests/api.py b/recipes/recipe_modules/chromium_tests/api.py
index 27a9aa8..31543b1 100644
--- a/recipes/recipe_modules/chromium_tests/api.py
+++ b/recipes/recipe_modules/chromium_tests/api.py
@@ -1967,8 +1967,7 @@
self.m.chromium_swarming.configure_swarming(
'chromium',
precommit=False,
- builder_group=bot_meta_data.builder_id.group,
- default_priority=bot_meta_data.settings.swarming_default_priority)
+ builder_group=bot_meta_data.builder_id.group)
test_runner = self.create_test_runner(
tests,
serialize_tests=bot_meta_data.settings.serialize_tests,
diff --git a/recipes/recipe_modules/chromium_tests/bot_spec.py b/recipes/recipe_modules/chromium_tests/bot_spec.py
index 8a64381..a3ea9ae 100644
--- a/recipes/recipe_modules/chromium_tests/bot_spec.py
+++ b/recipes/recipe_modules/chromium_tests/bot_spec.py
@@ -185,8 +185,6 @@
# uploading private isolates to the public server.
isolate_server = attrib(str, default=None)
- # Override for the default priority used when creating swarming tasks
- swarming_default_priority = attrib(int, default=None)
# Dimensions to apply to all created swarming tasks
swarming_dimensions = mapping_attrib(str, default={})
# URL to override the swarming server to use
diff --git a/recipes/recipes/findit/chromium/export_bot_db.expected/with_mock_bdb.json b/recipes/recipes/findit/chromium/export_bot_db.expected/with_mock_bdb.json
index 3457b4f..cf09655 100644
--- a/recipes/recipes/findit/chromium/export_bot_db.expected/with_mock_bdb.json
+++ b/recipes/recipes/findit/chromium/export_bot_db.expected/with_mock_bdb.json
@@ -8,7 +8,7 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "{\"mockgroup\": {\"mockbuilder\": {\"luci_project\": \"chromium\", \"execution_mode\": \"compile/test\", \"parent_builder_group\": null, \"parent_buildername\": null, \"chromium_config\": \"chromium\", \"chromium_apply_config\": [\"foo\", \"bar\"], \"chromium_config_kwargs\": {}, \"chromium_tests_config\": \"chromium\", \"chromium_tests_apply_config\": [], \"gclient_config\": null, \"gclient_apply_config\": [], \"android_config\": null, \"android_apply_config\": [], \"test_results_config\": null, \"isolate_server\": null, \"swarming_default_priority\": null, \"swarming_dimensions\": {}, \"swarming_server\": null, \"android_version\": null, \"clobber\": false, \"build_gs_bucket\": null, \"test_specs\": [{\"test_type\": null, \"args\": [\"fake-url\", \"fake-config-name\"], \"kwargs\": {}}], \"serialize_tests\": false, \"perf_isolate_upload\": false, \"archive_build\": null, \"gs_bucket\": null, \"gs_acl\": null, \"gs_build_name\": null, \"cf_archive_build\": false, \"cf_gs_bucket\": null, \"cf_gs_acl\": null, \"cf_archive_name\": null, \"cf_archive_subdir_suffix\": \"\", \"bisect_archive_build\": false, \"bisect_gs_bucket\": null, \"bisect_gs_extra\": null, \"simulation_platform\": null, \"upload_isolates_but_do_not_run_tests\": false}}}",
+ "{\"mockgroup\": {\"mockbuilder\": {\"luci_project\": \"chromium\", \"execution_mode\": \"compile/test\", \"parent_builder_group\": null, \"parent_buildername\": null, \"chromium_config\": \"chromium\", \"chromium_apply_config\": [\"foo\", \"bar\"], \"chromium_config_kwargs\": {}, \"chromium_tests_config\": \"chromium\", \"chromium_tests_apply_config\": [], \"gclient_config\": null, \"gclient_apply_config\": [], \"android_config\": null, \"android_apply_config\": [], \"test_results_config\": null, \"isolate_server\": null, \"swarming_dimensions\": {}, \"swarming_server\": null, \"android_version\": null, \"clobber\": false, \"build_gs_bucket\": null, \"test_specs\": [{\"test_type\": null, \"args\": [\"fake-url\", \"fake-config-name\"], \"kwargs\": {}}], \"serialize_tests\": false, \"perf_isolate_upload\": false, \"archive_build\": null, \"gs_bucket\": null, \"gs_acl\": null, \"gs_build_name\": null, \"cf_archive_build\": false, \"cf_gs_bucket\": null, \"cf_gs_acl\": null, \"cf_archive_name\": null, \"cf_archive_subdir_suffix\": \"\", \"bisect_archive_build\": false, \"bisect_gs_bucket\": null, \"bisect_gs_extra\": null, \"simulation_platform\": null, \"upload_isolates_but_do_not_run_tests\": false}}}",
"gs://bucket/data.json"
],
"infra_step": true,
