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

@@ -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

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")
 

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"

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"],

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)

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

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