Bug 1707937 - Allow live site tests to run against GeckoView; r=perftest-reviewers,sparky

Differential Revision: https://phabricator.services.mozilla.com/D113536

taskcluster/ci/test/browsertime-mobile.yml

@@ -181,13 +181,9 @@ browsertime-youtube-playback-mobile:
     max-run-time: 3600
 
 browsertime-tp6m-live:
-    description: "Raptor (browsertime) tp6 live site page-load tests on android"
-    raptor-test: tp6m
+    <<: *tp6m-defaults
+    apps: [chrome-m, fenix, geckoview]
     raptor-subtests:
-        by-app:
-            geckoview:
-                - [cnn-ampstories, cnn-amp]
-            default:
         - allrecipes
         - amazon
         - [amazon-search, amazon-s]
@@ -228,8 +224,13 @@ browsertime-tp6m-live:
         - wikipedia
         - youtube
         - [youtube-watch, youtube-w]
-    apps: ["fenix", "chrome-m", "geckoview"]
+    mozharness:
+        extra-options:
+            - --live-sites
+            - --chimera
     run-on-projects:
+        by-subtest:
+            cnn-ampstories:
                 by-app:
                     geckoview:
                         by-test-platform:
@@ -237,12 +238,9 @@ browsertime-tp6m-live:
                             android-hw-p2.*aarch64-shippable-qr.*: [autoland]
                             default: []
                     default: []
-    run-visual-metrics: true
+            default: []
+    tier: 3
     treeherder-symbol: Btime-live(tp6m)
-    mozharness:
-        extra-options:
-            - --live-sites
-            - --chimera
 
 browsertime-tp6m-profiling:
     description: "Raptor (browsertime) tp6 page-load tests on android with Gecko profiling"

taskcluster/taskgraph/target_tasks.py

@@ -791,7 +791,7 @@ def target_tasks_general_perf_testing(full_task_graph, parameters, graph_config)
             if "chrome-m" not in try_name and "-qr" not in platform:
                 return False
             # Select live site tests
-            if "-live" in try_name and ("fenix" in try_name or "chrome-m" in try_name):
+            if "-live" in try_name:
                 return True
             # Select fenix resource usage tests
             if "fenix" in try_name: