Bug 1857623 - Enable speedometer and speedometer3 to run on pixel6 de…

…vices. r=perftest-reviewers,sparky,taskgraph-reviewers,bhearsum In this bug we are adding all the things required to run speedometer and speedometer3 tests on the pixel6 devices in CI Differential Revision: https://phabricator.services.mozilla.com/D199981
dothq · Feb 6, 2024 · 48eba74 · 48eba74
1 parent 0a27716
commit 48eba74
Show file tree

Hide file tree

Showing 6 changed files with 155 additions and 8 deletions.
diff --git a/taskcluster/ci/test/browsertime-mobile.yml b/taskcluster/ci/test/browsertime-mobile.yml
@@ -350,7 +350,10 @@ browsertime-benchmark-speedometer-mobile:
                 by-test-platform:
                     android-hw-a51.*shippable-qr.*: [trunk]
                     default: []
-            cstm-car-m: [mozilla-central]
+            cstm-car-m:
+                by-test-platform:
+                    android-hw-p6.*shippable-qr.*: []
+                    default: [mozilla-central]
             default: []
     treeherder-symbol: Btime(sp)
     mozharness:
@@ -374,7 +377,10 @@ browsertime-benchmark-speedometer3-mobile:
                 by-test-platform:
                     android-hw-a51.*shippable-qr.*: [trunk-only]
                     default: []
-            cstm-car-m: [mozilla-central]
+            cstm-car-m:
+                by-test-platform:
+                    android-hw-p6.*shippable-qr.*: []
+                    default: [mozilla-central]
             default: []
     treeherder-symbol: Btime(sp3)
     mozharness:

diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
@@ -496,4 +496,5 @@ android-hw-p5-13-0-android-aarch64-shippable-qr/opt:
 
 android-hw-p6-13-0-android-aarch64-shippable-qr/opt:
     build-platform: android-aarch64-shippable/opt
-    test-sets: []
+    test-sets:
+        - android-hw-speedometer-tests
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
@@ -493,3 +493,7 @@ android-hw-browsertime:
 
 android-hw-browsertime-profiling:
     - browsertime-tp6m-profiling
+
+android-hw-speedometer-tests:
+    - browsertime-benchmark-speedometer-mobile
+    - browsertime-benchmark-speedometer3-mobile
diff --git a/taskcluster/gecko_taskgraph/target_tasks.py b/taskcluster/gecko_taskgraph/target_tasks.py
@@ -743,10 +743,11 @@ def filter(task):
             return False
 
         # Desktop and Android selection for CaR
-        if "browsertime" in try_name and (
-            "custom-car" in try_name or "cstm-car-m" in try_name
-        ):
-            return True
+        if "android" not in platform or accept_raptor_android_build(platform):
+            if "browsertime" in try_name and (
+                "custom-car" in try_name or "cstm-car-m" in try_name
+            ):
+                return True
         return False
 
     return [l for l, t in full_task_graph.tasks.items() if filter(t)]
@@ -887,7 +888,10 @@ def filter(task):
         attributes = task.attributes
         if attributes.get("unittest_suite") != "raptor":
             return False
-        if "windows10-32" not in platform:
+
+        if (
+            "android" not in platform and "windows10-32" not in platform
+        ) or accept_raptor_android_build(platform):
             try_name = attributes.get("raptor_try_name")
             if (
                 "browsertime" in try_name

diff --git a/testing/perfdocs/generated/raptor.rst b/testing/perfdocs/generated/raptor.rst
@@ -3374,6 +3374,37 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
         - ❌
 
 
+   .. list-table:: **test-android-hw-p6-13-0-android-aarch64-shippable-qr/opt**
+      :widths: 30 15 15 15 15
+      :header-rows: 1
+
+      * - **Test Name**
+        - mozilla-central
+        - autoland
+        - mozilla-release
+        - mozilla-beta
+      * - **browsertime-benchmark-speedometer-mobile-chrome-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer-mobile-cstm-car-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer-mobile-fenix-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer-mobile-geckoview-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+
+
    .. list-table:: **test-linux1804-64-clang-trunk-qr/opt**
       :widths: 30 15 15 15 15
       :header-rows: 1
@@ -3701,6 +3732,37 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
         - ❌
 
 
+   .. list-table:: **test-android-hw-p6-13-0-android-aarch64-shippable-qr/opt**
+      :widths: 30 15 15 15 15
+      :header-rows: 1
+
+      * - **Test Name**
+        - mozilla-central
+        - autoland
+        - mozilla-release
+        - mozilla-beta
+      * - **browsertime-benchmark-speedometer-mobile-chrome-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer-mobile-cstm-car-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer-mobile-fenix-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer-mobile-geckoview-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+
+
    .. list-table:: **test-linux1804-64-clang-trunk-qr/opt**
       :widths: 30 15 15 15 15
       :header-rows: 1
@@ -4039,6 +4101,37 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
         - ❌
 
 
+   .. list-table:: **test-android-hw-p6-13-0-android-aarch64-shippable-qr/opt**
+      :widths: 30 15 15 15 15
+      :header-rows: 1
+
+      * - **Test Name**
+        - mozilla-central
+        - autoland
+        - mozilla-release
+        - mozilla-beta
+      * - **browsertime-benchmark-speedometer3-mobile-chrome-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer3-mobile-cstm-car-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer3-mobile-fenix-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer3-mobile-geckoview-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+
+
    .. list-table:: **test-linux1804-64-clang-trunk-qr/opt**
       :widths: 30 15 15 15 15
       :header-rows: 1
@@ -4368,6 +4461,37 @@ Standard benchmarks are third-party tests (i.e. Speedometer) that we have integr
         - ❌
 
 
+   .. list-table:: **test-android-hw-p6-13-0-android-aarch64-shippable-qr/opt**
+      :widths: 30 15 15 15 15
+      :header-rows: 1
+
+      * - **Test Name**
+        - mozilla-central
+        - autoland
+        - mozilla-release
+        - mozilla-beta
+      * - **browsertime-benchmark-speedometer3-mobile-chrome-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer3-mobile-cstm-car-m-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer3-mobile-fenix-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+      * - **browsertime-benchmark-speedometer3-mobile-geckoview-nofis**
+        - ❌
+        - ❌
+        - ❌
+        - ❌
+
+
    .. list-table:: **test-linux1804-64-clang-trunk-qr/opt**
       :widths: 30 15 15 15 15
       :header-rows: 1

diff --git a/testing/raptor/raptor/browsertime/android.py b/testing/raptor/raptor/browsertime/android.py
@@ -107,6 +107,14 @@ def browsertime_args(self):
                 )
                 activity = "mozilla.telemetry.glean.debug.GleanDebugActivity"
 
+            if self.device.shell_output("getprop ro.product.model") in ["Pixel 6"]:
+                args_list.extend(
+                    [
+                        '--firefox.geckodriverArgs="--android-storage"',
+                        '--firefox.geckodriverArgs="app"',
+                    ]
+                )
+
             args_list.extend(
                 [
                     "--browser",