From 5b7f54f6c0484f549af52c151fec0cd939c4e9bf Mon Sep 17 00:00:00 2001 From: Mike Hommey Date: Tue, 12 Dec 2023 22:15:37 +0000 Subject: [PATCH 1/2] Bug 1868680 - Stop prewarming the ARM AVD. r=geckoview-reviewers,owlish a=release prewarming the AVDs was done for CI, where AVDs are used only once in each task using them, and the cost of first use is high. Prewarming reduces that overhead. However, the ARM AVD is not used on CI (anymore?), so we don't need them prewarmed. This unblocks the situation wrt the failure to run the emulator on CI, while not addressing the underlying issues, so that CoT keys can be rotated without waiting for the full situation to be resolved. Differential Revision: https://phabricator.services.mozilla.com/D195820 --- python/mozboot/mozboot/android-avds/arm.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/mozboot/mozboot/android-avds/arm.json b/python/mozboot/mozboot/android-avds/arm.json index bcabc737fd7c3..756018631c561 100644 --- a/python/mozboot/mozboot/android-avds/arm.json +++ b/python/mozboot/mozboot/android-avds/arm.json @@ -22,5 +22,6 @@ "hw.lcd.density": "320", "disk.dataPartition.size": "4000MB", "sdcard.size": "600M" - } + }, + "emulator_prewarm": false } From c53c86931943cbc4457f09bc95d42a6fe97c153e Mon Sep 17 00:00:00 2001 From: mcheang Date: Thu, 21 Dec 2023 18:31:59 +0000 Subject: [PATCH 2/2] Bug 1871450 - Fix failing search-config-v2 schema validation test on release 121. a=test-only Differential Revision: https://phabricator.services.mozilla.com/D197094 --- .../test_searchconfig_validates.js | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/toolkit/components/search/tests/xpcshell/searchconfigs/test_searchconfig_validates.js b/toolkit/components/search/tests/xpcshell/searchconfigs/test_searchconfig_validates.js index d722c476c98db..2f35cd9aaed0e 100644 --- a/toolkit/components/search/tests/xpcshell/searchconfigs/test_searchconfig_validates.js +++ b/toolkit/components/search/tests/xpcshell/searchconfigs/test_searchconfig_validates.js @@ -127,20 +127,25 @@ add_task(async function test_ui_schema_valid_v1() { await checkUISchemaValid(searchConfigSchemaV1, uiSchema); }); -add_task(async function test_search_config_validates_to_schema() { - delete SearchUtils.newSearchConfigEnabled; - SearchUtils.newSearchConfigEnabled = true; - - let selector = new SearchEngineSelector(() => {}); - let searchConfig = await selector.getEngineConfiguration(); - - await checkSearchConfigValidates(searchConfigSchema, searchConfig); -}); - -add_task(async function test_ui_schema_valid() { - let uiSchema = await IOUtils.readJSON( - PathUtils.join(do_get_cwd().path, "search-engine-config-v2-ui-schema.json") - ); +if (SearchUtils.newSearchConfigEnabled) { + add_task(async function test_search_config_validates_to_schema() { + delete SearchUtils.newSearchConfigEnabled; + SearchUtils.newSearchConfigEnabled = true; + + let selector = new SearchEngineSelector(() => {}); + let searchConfig = await selector.getEngineConfiguration(); + + await checkSearchConfigValidates(searchConfigSchema, searchConfig); + }); + + add_task(async function test_ui_schema_valid() { + let uiSchema = await IOUtils.readJSON( + PathUtils.join( + do_get_cwd().path, + "search-engine-config-v2-ui-schema.json" + ) + ); - await checkUISchemaValid(searchConfigSchema, uiSchema); -}); + await checkUISchemaValid(searchConfigSchema, uiSchema); + }); +}