From 4781a0ca73100bba92c1d96973c2af83bb0072ab Mon Sep 17 00:00:00 2001 From: andrej Date: Mon, 9 Sep 2024 14:11:59 +0000 Subject: [PATCH] Bug 1908119 - Migrate S21 tests to S24 device. r=perftest-reviewers,fbilt Differential Revision: https://phabricator.services.mozilla.com/D221358 --- taskcluster/gecko_taskgraph/target_tasks.py | 8 +++----- taskcluster/gecko_taskgraph/transforms/test/raptor.py | 2 -- taskcluster/gecko_taskgraph/transforms/test/worker.py | 5 ----- taskcluster/gecko_taskgraph/try_option_syntax.py | 1 - taskcluster/kinds/test/browsertime-mobile.yml | 8 ++++---- taskcluster/kinds/test/test-platforms.yml | 8 ++------ testing/perfdocs/generated/raptor.rst | 8 ++++---- 7 files changed, 13 insertions(+), 27 deletions(-) diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py index d3be3ff54ccb..f0533540fef7 100644 --- a/taskcluster/gecko_taskgraph/target_tasks.py +++ b/taskcluster/gecko_taskgraph/target_tasks.py @@ -257,8 +257,6 @@ def accept_raptor_android_build(platform): return False if "p6" in platform and "aarch64" in platform: return True - if "s21" in platform and "aarch64" in platform: - return True if "s24" in platform and "aarch64" in platform: return True if "a55" in platform and "aarch64" in platform: @@ -805,7 +803,7 @@ def target_tasks_custom_car_perf_testing(full_task_graph, parameters, graph_conf if "browsertime" in try_name and ( "custom-car" in try_name or "cstm-car-m" in try_name ): - if "hw-s21" in platform and "speedometer3" not in try_name: + if "hw-s24" in platform and "speedometer3" not in try_name: return False return True return False @@ -863,7 +861,7 @@ def target_tasks_general_perf_testing(full_task_graph, parameters, graph_config) return True # Android selection elif accept_raptor_android_build(platform): - if "hw-s21" in platform and "speedometer3" not in try_name: + if "hw-s24" in platform and "speedometer3" not in try_name: return False if "chrome-m" in try_name and "essential" in try_name: return True @@ -954,7 +952,7 @@ def target_tasks_speedometer_tests(full_task_graph, parameters, graph_config): platform ): try_name = attributes.get("raptor_try_name") - if "hw-s21" in platform and "speedometer3" not in try_name: + if "hw-s24" in platform and "speedometer3" not in try_name: return False if ( "browsertime" in try_name diff --git a/taskcluster/gecko_taskgraph/transforms/test/raptor.py b/taskcluster/gecko_taskgraph/transforms/test/raptor.py index 8f5ac30e326c..759f3b49ec7f 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/raptor.py +++ b/taskcluster/gecko_taskgraph/transforms/test/raptor.py @@ -284,8 +284,6 @@ def add_extra_options(config, tests): extra_options.append("--device-name=p5_aarch64") elif test_platform.startswith("android-hw-p6"): extra_options.append("--device-name=p6_aarch64") - elif test_platform.startswith("android-hw-s21"): - extra_options.append("--device-name=s21_aarch64") elif test_platform.startswith("android-hw-s24"): extra_options.append("--device-name=s24_aarch64") diff --git a/taskcluster/gecko_taskgraph/transforms/test/worker.py b/taskcluster/gecko_taskgraph/transforms/test/worker.py index b87225391f2a..ed75fa1a4cf6 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/worker.py +++ b/taskcluster/gecko_taskgraph/transforms/test/worker.py @@ -173,11 +173,6 @@ def set_worker_type(config, tasks): task["worker-type"] = "t-bitbar-gw-unit-p6" else: task["worker-type"] = "t-bitbar-gw-perf-p6" - elif test_platform.startswith("android-hw-s21"): - if task["suite"] != "raptor": - task["worker-type"] = "t-bitbar-gw-unit-s21" - else: - task["worker-type"] = "t-bitbar-gw-perf-s21" elif test_platform.startswith("android-hw-s24"): if task["suite"] != "raptor": task["worker-type"] = "t-bitbar-gw-unit-s24" diff --git a/taskcluster/gecko_taskgraph/try_option_syntax.py b/taskcluster/gecko_taskgraph/try_option_syntax.py index 3648642a3845..cd29523f9e16 100644 --- a/taskcluster/gecko_taskgraph/try_option_syntax.py +++ b/taskcluster/gecko_taskgraph/try_option_syntax.py @@ -127,7 +127,6 @@ UNITTEST_PLATFORM_PRETTY_NAMES = { "Android 13.0 Google Pixel 5 32bit": ["android-hw-p5-13.0-arm7"], "Android 13.0 Google Pixel 5 64bit": ["android-hw-p5-13.0-android-aarch64"], "Android 13.0 Google Pixel 6 64bit": ["android-hw-p6-13.0-android-aarch64"], - "Android 13.0 Samsung S21 64bit": ["android-hw-s21-13.0-android-aarch64"], "Android 14.0 Samsung A55 64bit": ["android-hw-a55-14.0-android-aarch64"], "Android 14.0 Samsung S24 64bit": ["android-hw-s24-14.0-android-aarch64"], "Windows 10": ["windows10-64"], diff --git a/taskcluster/kinds/test/browsertime-mobile.yml b/taskcluster/kinds/test/browsertime-mobile.yml index f85fa1d91cf2..ee5b7175bf95 100644 --- a/taskcluster/kinds/test/browsertime-mobile.yml +++ b/taskcluster/kinds/test/browsertime-mobile.yml @@ -455,7 +455,7 @@ browsertime-benchmark-speedometer-mobile: cstm-car-m: by-test-platform: android-hw-p6.*shippable-qr.*: [] - android-hw-s21.*shippable-qr.*: [] + android-hw-s24.*shippable-qr.*: [] default: [mozilla-central] default: [] treeherder-symbol: Btime(sp) @@ -481,20 +481,20 @@ browsertime-benchmark-speedometer3-mobile: android-hw-a51.*shippable-qr.*: [trunk-only] android-hw-a55.*shippable-qr.*: [trunk-only] android-hw-p6.*shippable-qr.*: [mozilla-central] - android-hw-s21.*shippable-qr.*: [mozilla-central] + android-hw-s24.*shippable-qr.*: [mozilla-central] default: [] geckoview: by-test-platform: android-hw-a51.*shippable-qr.*: [trunk-only] android-hw-a55.*shippable-qr.*: [trunk-only] android-hw-p6.*shippable-qr.*: [mozilla-central] - android-hw-s21.*shippable-qr.*: [mozilla-central] + android-hw-s24.*shippable-qr.*: [mozilla-central] default: [] cstm-car-m: [mozilla-central] chrome-m: by-test-platform: android-hw-p6.*shippable-qr.*: [mozilla-central] - android-hw-s21.*shippable-qr.*: [mozilla-central] + android-hw-s24.*shippable-qr.*: [mozilla-central] default: [] default: [] treeherder-symbol: Btime(sp3) diff --git a/taskcluster/kinds/test/test-platforms.yml b/taskcluster/kinds/test/test-platforms.yml index fb5d883dfb85..a5d0a40d15f9 100644 --- a/taskcluster/kinds/test/test-platforms.yml +++ b/taskcluster/kinds/test/test-platforms.yml @@ -487,11 +487,6 @@ android-hw-p6-13-0-android-aarch64-shippable-qr/opt: test-sets: - android-hw-speedometer-tests -android-hw-s21-13-0-android-aarch64-shippable-qr/opt: - build-platform: android-aarch64-shippable/opt - test-sets: - - android-hw-speedometer-tests - android-hw-a55-14-0-android-aarch64-shippable-qr/opt: build-platform: android-aarch64-shippable/opt test-sets: @@ -500,4 +495,5 @@ android-hw-a55-14-0-android-aarch64-shippable-qr/opt: android-hw-s24-14-0-android-aarch64-shippable-qr/opt: build-platform: android-aarch64-shippable/opt - test-sets: [] + test-sets: + - android-hw-speedometer-tests diff --git a/testing/perfdocs/generated/raptor.rst b/testing/perfdocs/generated/raptor.rst index 46cd618eb33e..239f3263f3d9 100644 --- a/testing/perfdocs/generated/raptor.rst +++ b/testing/perfdocs/generated/raptor.rst @@ -4589,7 +4589,7 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr - ❌ - .. list-table:: **test-android-hw-s21-13-0-android-aarch64-shippable-qr/opt** + .. list-table:: **test-android-hw-s24-14-0-android-aarch64-shippable-qr/opt** :widths: 30 15 15 15 15 :header-rows: 1 @@ -4973,7 +4973,7 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr - ❌ - .. list-table:: **test-android-hw-s21-13-0-android-aarch64-shippable-qr/opt** + .. list-table:: **test-android-hw-s24-14-0-android-aarch64-shippable-qr/opt** :widths: 30 15 15 15 15 :header-rows: 1 @@ -5372,7 +5372,7 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr - ❌ - .. list-table:: **test-android-hw-s21-13-0-android-aarch64-shippable-qr/opt** + .. list-table:: **test-android-hw-s24-14-0-android-aarch64-shippable-qr/opt** :widths: 30 15 15 15 15 :header-rows: 1 @@ -5789,7 +5789,7 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr - ❌ - .. list-table:: **test-android-hw-s21-13-0-android-aarch64-shippable-qr/opt** + .. list-table:: **test-android-hw-s24-14-0-android-aarch64-shippable-qr/opt** :widths: 30 15 15 15 15 :header-rows: 1