Bug 1564242 Split raptor.yml taskcluster test configs into smaller files: part 5 (refbrow+firefox) r=perftest-reviewers,Bebe
authoralexandru.ionescu <alexandru.ionescu@softvision.ro>
Wed, 28 Aug 2019 12:41:46 +0000
changeset 554138 3364fb1f0140b8846571747be6f1b53689d6bf3a
parent 554137 4b7516635108934fb6020fc35d8325a0f9d07c0b
child 554139 20c9dfa0cf86c8964988ea18f23feff57dc3356d
push id2165
push userffxbld-merge
push dateMon, 14 Oct 2019 16:30:58 +0000
treeherdermozilla-release@0eae18af659f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersperftest-reviewers, Bebe
bugs1564242
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1564242 Split raptor.yml taskcluster test configs into smaller files: part 5 (refbrow+firefox) r=perftest-reviewers,Bebe Differential Revision: https://phabricator.services.mozilla.com/D43569
taskcluster/ci/test/kind.yml
taskcluster/ci/test/raptor-gve.yml
taskcluster/ci/test/raptor-refbrow.yml
taskcluster/ci/test/raptor.yml
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -33,16 +33,17 @@ jobs-from:
     - misc.yml
     - mochitest.yml
     - raptor.yml
     - raptor-chromium.yml
     - raptor-fenix.yml
     - raptor-fennec.yml
     - raptor-fennec64.yml
     - raptor-gve.yml
+    - raptor-refbrow.yml
     - reftest.yml
     - talos.yml
     - web-platform.yml
     - xpcshell.yml
 
 job-defaults:
     attributes:
         retrigger: true
--- a/taskcluster/ci/test/raptor-gve.yml
+++ b/taskcluster/ci/test/raptor-gve.yml
@@ -136,16 +136,69 @@ raptor-speedometer-geckoview:
     max-run-time: 900
     mozharness:
         extra-options:
             - --test=raptor-speedometer
             - --app=geckoview
             - --binary=org.mozilla.geckoview_example
             - --activity=org.mozilla.geckoview_example.GeckoViewActivity
 
+raptor-speedometer-geckoview-power:
+    description: "Raptor Speedometer power on GeckoView"
+    try-name: raptor-speedometer-geckoview-power
+    treeherder-symbol: Rap(sp-p)
+    target: geckoview_example.apk
+    run-on-projects: []
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --power-test
+            - --page-cycles 5
+            - --host HOST_IP
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-speedometer-geckoview-cpu-memory:
+    description: "Raptor Speedometer cpu/memory on GeckoView"
+    try-name: raptor-speedometer-geckoview-cpu-memory
+    treeherder-symbol: Rap(sp-cm)
+    target: geckoview_example.apk
+    run-on-projects: []
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --cpu-test
+            - --memory-test
+            - --page-cycles 5
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
+raptor-speedometer-geckoview-cpu-memory-power:
+    description: "Raptor Speedometer cpu/memory/power on GeckoView"
+    try-name: raptor-speedometer-geckoview-cpu-memory-power
+    treeherder-symbol: Rap(sp-cmp)
+    target: geckoview_example.apk
+    run-on-projects: []
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer
+            - --app=geckoview
+            - --binary=org.mozilla.geckoview_example
+            - --cpu-test
+            - --memory-test
+            - --power-test
+            - --page-cycles 5
+            - --host HOST_IP
+            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
+
 raptor-scn-power-idle-geckoview:
     description: "Raptor idle-browser power-use measurement on GeckoView"
     try-name: raptor-scn-power-idle-geckoview
     treeherder-symbol: Rap(idl-p)
     run-on-projects: []
     tier: 3
     mozharness:
         extra-options:
new file mode 100644
--- /dev/null
+++ b/taskcluster/ci/test/raptor-refbrow.yml
@@ -0,0 +1,565 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+---
+job-defaults:
+    max-run-time: 1800
+    suite: raptor
+    workdir: /builds/worker
+    run-on-projects: []
+    tier: 2
+    target:
+        by-test-platform:
+            android-hw.*-aarch64.*/.*:
+                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
+                name: target.apk
+            default:
+                index: project.mobile.reference-browser.v2.raptor.latest.arm
+                name: target.apk
+    virtualization: hardware
+    mozharness:
+        script: raptor_script.py
+        config:
+            - raptor/android_hw_config.py
+
+raptor-tp6m-1-refbrow:
+    description: "Raptor tp6m-1 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-1)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-1
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-2-refbrow:
+    description: "Raptor tp6m-2 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-2)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-2
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-3-refbrow:
+    description: "Raptor tp6m-3 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-3)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-3
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-4-refbrow:
+    description: "Raptor tp6m-4 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-4)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-4
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-5-refbrow:
+    description: "Raptor tp6m-5 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-5)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-5
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-6-refbrow:
+    description: "Raptor tp6m-6 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-6)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-6
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-7-refbrow:
+    description: "Raptor tp6m-7 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-7)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-7
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-8-refbrow:
+    description: "Raptor tp6m-8 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-8)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-8
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-9-refbrow:
+    description: "Raptor tp6m-9 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-9)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-9
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-10-refbrow:
+    description: "Raptor tp6m-10 on the reference browser"
+    treeherder-symbol: Rap-refbrow(tp6m-10)
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-10
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-scn-power-idle-refbrow:
+    description: "Raptor idle-browser power on Reference Browser"
+    try-name: raptor-scn-power-idle-refbrow
+    treeherder-symbol: Rap-refbrow(idl-p)
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-scn-cpu-memory-idle-refbrow:
+    description: "Raptor idle-browser cpu/memory on Reference Browser"
+    try-name: raptor-scn-cpu-memory-idle-refbrow
+    treeherder-symbol: Rap-refbrow(idl-cm)
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --cpu-test
+            - --memory-test
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-scn-cpu-memory-power-idle-refbrow:
+    description: "Raptor idle-browser cpu/memory/power on Reference Browser"
+    try-name: raptor-scn-cpu-memory-power-idle-refbrow
+    treeherder-symbol: Rap-refbrow(idl-cmp)
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --cpu-test
+            - --memory-test
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-scn-power-idle-bg-refbrow:
+    description: "Raptor idle-browser (backgrounded) power on Reference Browser"
+    try-name: raptor-scn-power-idle-bg-refbrow
+    treeherder-symbol: Rap-refbrow(idlbg-p)
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle-bg
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-scn-cpu-memory-idle-bg-refbrow:
+    description: "Raptor idle-browser (backgrounded) cpu/memory on Reference Browser"
+    try-name: raptor-scn-cpu-memory-idle-bg-refbrow
+    treeherder-symbol: Rap-refbrow(idlbg-cm)
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle-bg
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --cpu-test
+            - --memory-test
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-scn-cpu-memory-power-idle-bg-refbrow:
+    description: "Raptor idle-browser (backgrounded) cpu/memory/power on Reference Browser"
+    try-name: raptor-scn-cpu-memory-power-idle-bg-refbrow
+    treeherder-symbol: Rap-refbrow(idlbg-cmp)
+    tier: 3
+    max-run-time: 1800
+    mozharness:
+        extra-options:
+            - --test=raptor-scn-power-idle-bg
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --cpu-test
+            - --memory-test
+            - --power-test
+            - --host HOST_IP
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-speedometer-refbrow:
+    description: "Raptor Speedometer on the reference browser"
+    treeherder-symbol: Rap-refbrow(sp)
+    mozharness:
+        extra-options:
+            - --test=raptor-speedometer
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-unity-webgl-refbrow:
+    description: "Raptor Unity WebGL on the reference browser"
+    treeherder-symbol: Rap-refbrow(ugl)
+    mozharness:
+        extra-options:
+            - --test=raptor-unity-webgl
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+    fetches:
+        fetch:
+            - unity-webgl
+
+raptor-tp6m-1-refbrow-cold:
+    description: "Raptor tp6m-1 cold page-load on the reference browser"
+    try-name: raptor-tp6m-1-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-1)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-1
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+
+raptor-tp6m-2-refbrow-cold:
+    description: "Raptor tp6m-2 cold page-load on the reference browser"
+    try-name: raptor-tp6m-2-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-2)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-2
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-3-refbrow-cold:
+    description: "Raptor tp6m-3 cold page-load on the reference browser"
+    try-name: raptor-tp6m-3-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-3)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-3
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-4-refbrow-cold:
+    description: "Raptor tp6m-4 cold page-load on the reference browser"
+    try-name: raptor-tp6m-4-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-4)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-4
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-5-refbrow-cold:
+    description: "Raptor tp6m-5 cold page-load on the reference browser"
+    try-name: raptor-tp6m-5-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-5)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-5
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-6-refbrow-cold:
+    description: "Raptor tp6m-6 cold page-load on the reference browser"
+    try-name: raptor-tp6m-6-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-6)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-6
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-7-refbrow-cold:
+    description: "Raptor tp6m-7 cold page-load on the reference browser"
+    try-name: raptor-tp6m-7-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-7)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-7
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-8-refbrow-cold:
+    description: "Raptor tp6m-8 cold page-load on the reference browser"
+    try-name: raptor-tp6m-8-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-8)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-8
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-9-refbrow-cold:
+    description: "Raptor tp6m-9 cold page-load on the reference browser"
+    try-name: raptor-tp6m-9-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-9)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-9
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-10-refbrow-cold:
+    description: "Raptor tp6m-10 cold page-load on the reference browser"
+    try-name: raptor-tp6m-10-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-10)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-10
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-11-refbrow-cold:
+    description: "Raptor tp6m-11 cold page-load on the reference browser"
+    try-name: raptor-tp6m-11-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-11)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-11
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-12-refbrow-cold:
+    description: "Raptor tp6m-12 cold page-load on the reference browser"
+    try-name: raptor-tp6m-12-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-12)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-12
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-13-refbrow-cold:
+    description: "Raptor tp6m-13 cold page-load on the reference browser"
+    try-name: raptor-tp6m-13-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-13)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-13
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-14-refbrow-cold:
+    description: "Raptor tp6m-14 cold page-load on the reference browser"
+    try-name: raptor-tp6m-14-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-14)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-14
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-15-refbrow-cold:
+    description: "Raptor tp6m-15 cold page-load on the reference browser"
+    try-name: raptor-tp6m-15-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-15)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-15
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-16-refbrow-cold:
+    description: "Raptor tp6m-16 cold page-load on the reference browser"
+    try-name: raptor-tp6m-16-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-16)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-16
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-17-refbrow-cold:
+    description: "Raptor tp6m-17 cold page-load on the reference browser"
+    try-name: raptor-tp6m-17-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-17)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-17
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-18-refbrow-cold:
+    description: "Raptor tp6m-18 cold page-load on the reference browser"
+    try-name: raptor-tp6m-18-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-18)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-18
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-19-refbrow-cold:
+    description: "Raptor tp6m-19 cold page-load on the reference browser"
+    try-name: raptor-tp6m-19-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-19)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-19
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-20-refbrow-cold:
+    description: "Raptor tp6m-20 cold page-load on the reference browser"
+    try-name: raptor-tp6m-20-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-20)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-20
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-21-refbrow-cold:
+    description: "Raptor tp6m-21 cold page-load on the reference browser"
+    try-name: raptor-tp6m-21-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-21)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-21
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-22-refbrow-cold:
+    description: "Raptor tp6m-22 cold page-load on the reference browser"
+    try-name: raptor-tp6m-22-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-22)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-22
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-23-refbrow-cold:
+    description: "Raptor tp6m-23 cold page-load on the reference browser"
+    try-name: raptor-tp6m-23-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-23)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-23
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivityy
+
+raptor-tp6m-24-refbrow-cold:
+    description: "Raptor tp6m-24 cold page-load on the reference browser"
+    try-name: raptor-tp6m-24-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-24)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-24
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-25-refbrow-cold:
+    description: "Raptor tp6m-25 cold page-load on the reference browser"
+    try-name: raptor-tp6m-25-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-25)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-25
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-26-refbrow-cold:
+    description: "Raptor tp6m-26 cold page-load on the reference browser"
+    try-name: raptor-tp6m-26-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-26)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-26
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
+
+raptor-tp6m-27-refbrow-cold:
+    description: "Raptor tp6m-27 cold page-load on the reference browser"
+    try-name: raptor-tp6m-27-refbrow-cold
+    treeherder-symbol: Rap-refbrow(tp6m-c-27)
+    e10s: true
+    mozharness:
+        extra-options:
+            - --test=raptor-tp6m-cold-27
+            - --app=refbrow
+            - --binary-path=org.mozilla.reference.browser.raptor
+            - --activity=org.mozilla.reference.browser.BrowserTestActivity
--- a/taskcluster/ci/test/raptor.yml
+++ b/taskcluster/ci/test/raptor.yml
@@ -4,38 +4,29 @@
 ---
 job-defaults:
     max-run-time:
         by-test-platform:
             .*-qr/.*: 2400
             .*-ref-hw-2017/.*: 2400
             default: 1800
     suite: raptor
-    workdir:
-        by-test-platform:
-            android-hw.*: /builds/worker
-            default: /home/cltbld
+    workdir: /home/cltbld
     run-on-projects:
         by-test-platform:
             windows10-64-ref-hw-2017/opt: ['try', 'mozilla-central']
             windows10-aarch64/opt: ['try', 'mozilla-central']
             (?:windows10-64|windows7-32|linux64)(?:-qr)?/opt: ['mozilla-central', 'try']
             macosx.*64(?:-qr)?/opt: ['mozilla-central', 'try']
-            # When run-on-projects is [], the task is not run by default
-            # on any branches. To run the tasks on try through mach try fuzzy
-            # --full needs to be supplied.
-            android-hw-.*/opt: []
-            android-hw-.*/pgo: ['trunk', 'mozilla-beta']
             default: ['try', 'trunk', 'mozilla-beta']
     tier:
         by-test-platform:
             windows10-aarch64/.*: 2
             windows10-64-ccov/.*: 3
             linux64-ccov/.*: 3
-            android-hw-g5.*: 2
             default: 1
     virtualization:
         by-test-platform:
             windows10-64-ccov/.*: virtual
             default: hardware
     mozharness:
         script: raptor_script.py
         config:
@@ -43,18 +34,16 @@ job-defaults:
                 macosx.*:
                     - raptor/mac_config.py
                 windows.*:
                     - raptor/windows_config.py
                 windows10-64-ccov/debug:
                     - raptor/windows_vm_config.py
                 linux64-ccov/opt:
                     - raptor/linux64_config_taskcluster.py
-                android-hw.*:
-                    - raptor/android_hw_config.py
                 default:
                     - raptor/linux_config.py
 
 raptor-tp6-1-firefox:
     description: "Raptor tp6-1 on Firefox"
     variants: ["fission"]
     try-name: raptor-tp6-1-firefox
     treeherder-symbol: Rap(tp6-1)
@@ -267,216 +256,16 @@ raptor-tp6-binast-1-firefox:
     description: "Raptor tp6-binast-1 on Firefox"
     variants: ["fission"]
     try-name: raptor-tp6-binast-1
     treeherder-symbol: Rap(tp6-b-1)
     mozharness:
         extra-options:
             - --test=raptor-tp6-binast-1
 
-raptor-tp6m-1-refbrow:
-    description: "Raptor tp6m-1 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-1)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-1
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-2-refbrow:
-    description: "Raptor tp6m-2 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-2)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-2
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-3-refbrow:
-    description: "Raptor tp6m-3 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-3)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-3
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-4-refbrow:
-    description: "Raptor tp6m-4 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-4)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-4
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-5-refbrow:
-    description: "Raptor tp6m-5 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-5)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-5
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-6-refbrow:
-    description: "Raptor tp6m-6 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-6)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-6
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-7-refbrow:
-    description: "Raptor tp6m-7 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-7)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-7
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-8-refbrow:
-    description: "Raptor tp6m-8 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-8)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-8
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-9-refbrow:
-    description: "Raptor tp6m-9 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-9)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-9
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-10-refbrow:
-    description: "Raptor tp6m-10 on the reference browser"
-    treeherder-symbol: Rap-refbrow(tp6m-10)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-10
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
 raptor-speedometer-firefox:
     description: "Raptor Speedometer on Firefox"
     variants: ["fission"]
     try-name: raptor-speedometer-firefox
     treeherder-symbol: Rap(sp)
     mozharness:
         extra-options:
             - --test=raptor-speedometer
@@ -488,237 +277,16 @@ raptor-speedometer-firefox-profiling:
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 900
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-speedometer
             - --gecko-profile
 
-raptor-speedometer-geckoview-power:
-    description: "Raptor Speedometer power on GeckoView"
-    try-name: raptor-speedometer-geckoview-power
-    treeherder-symbol: Rap(sp-p)
-    target: geckoview_example.apk
-    run-on-projects: []
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-speedometer
-            - --app=geckoview
-            - --binary=org.mozilla.geckoview_example
-            - --power-test
-            - --page-cycles 5
-            - --host HOST_IP
-            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
-
-raptor-speedometer-geckoview-cpu-memory:
-    description: "Raptor Speedometer cpu/memory on GeckoView"
-    try-name: raptor-speedometer-geckoview-cpu-memory
-    treeherder-symbol: Rap(sp-cm)
-    target: geckoview_example.apk
-    run-on-projects: []
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-speedometer
-            - --app=geckoview
-            - --binary=org.mozilla.geckoview_example
-            - --cpu-test
-            - --memory-test
-            - --page-cycles 5
-            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
-
-raptor-speedometer-geckoview-cpu-memory-power:
-    description: "Raptor Speedometer cpu/memory/power on GeckoView"
-    try-name: raptor-speedometer-geckoview-cpu-memory-power
-    treeherder-symbol: Rap(sp-cmp)
-    target: geckoview_example.apk
-    run-on-projects: []
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-speedometer
-            - --app=geckoview
-            - --binary=org.mozilla.geckoview_example
-            - --cpu-test
-            - --memory-test
-            - --power-test
-            - --page-cycles 5
-            - --host HOST_IP
-            - --activity=org.mozilla.geckoview_example.GeckoViewActivity
-
-raptor-scn-power-idle-refbrow:
-    description: "Raptor idle-browser power on Reference Browser"
-    try-name: raptor-scn-power-idle-refbrow
-    treeherder-symbol: Rap-refbrow(idl-p)
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    run-on-projects: []
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --power-test
-            - --host HOST_IP
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-scn-cpu-memory-idle-refbrow:
-    description: "Raptor idle-browser cpu/memory on Reference Browser"
-    try-name: raptor-scn-cpu-memory-idle-refbrow
-    treeherder-symbol: Rap-refbrow(idl-cm)
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    run-on-projects: []
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --cpu-test
-            - --memory-test
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-scn-cpu-memory-power-idle-refbrow:
-    description: "Raptor idle-browser cpu/memory/power on Reference Browser"
-    try-name: raptor-scn-cpu-memory-power-idle-refbrow
-    treeherder-symbol: Rap-refbrow(idl-cmp)
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    run-on-projects: []
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --cpu-test
-            - --memory-test
-            - --power-test
-            - --host HOST_IP
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-scn-power-idle-bg-refbrow:
-    description: "Raptor idle-browser (backgrounded) power on Reference Browser"
-    try-name: raptor-scn-power-idle-bg-refbrow
-    treeherder-symbol: Rap-refbrow(idlbg-p)
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    run-on-projects: []
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle-bg
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --power-test
-            - --host HOST_IP
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-scn-cpu-memory-idle-bg-refbrow:
-    description: "Raptor idle-browser (backgrounded) cpu/memory on Reference Browser"
-    try-name: raptor-scn-cpu-memory-idle-bg-refbrow
-    treeherder-symbol: Rap-refbrow(idlbg-cm)
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    run-on-projects: []
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle-bg
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --cpu-test
-            - --memory-test
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-scn-cpu-memory-power-idle-bg-refbrow:
-    description: "Raptor idle-browser (backgrounded) cpu/memory/power on Reference Browser"
-    try-name: raptor-scn-cpu-memory-power-idle-bg-refbrow
-    treeherder-symbol: Rap-refbrow(idlbg-cmp)
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    run-on-projects: []
-    tier: 3
-    max-run-time: 1800
-    mozharness:
-        extra-options:
-            - --test=raptor-scn-power-idle-bg
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --cpu-test
-            - --memory-test
-            - --power-test
-            - --host HOST_IP
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-speedometer-refbrow:
-    description: "Raptor Speedometer on the reference browser"
-    treeherder-symbol: Rap-refbrow(sp)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-speedometer
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
 raptor-stylebench-firefox:
     description: "Raptor StyleBench on Firefox"
     variants: ["fission"]
     try-name: raptor-stylebench-firefox
     treeherder-symbol: Rap(sb)
     mozharness:
         extra-options:
             - --test=raptor-stylebench
@@ -840,39 +408,16 @@ raptor-unity-webgl-firefox-profiling:
     mozharness:
         extra-options:
             - --test=raptor-unity-webgl
             - --gecko-profile
     fetches:
         fetch:
             - unity-webgl
 
-raptor-unity-webgl-refbrow:
-    description: "Raptor Unity WebGL on the reference browser"
-    treeherder-symbol: Rap-refbrow(ugl)
-    run-on-projects: []
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-unity-webgl
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-    fetches:
-        fetch:
-            - unity-webgl
-
 raptor-wasm-misc-cranelift-firefox:
     description: "Raptor WASM Misc on Firefox with Cranelift"
     variants: ["fission"]
     try-name: raptor-wasm-misc-cranelift-firefox
     treeherder-symbol: Rap(wm-c)
     run-on-projects: ['mozilla-central', 'try']
     max-run-time: 1800
     mozharness:
@@ -1146,610 +691,16 @@ raptor-tp6-4-firefox-cold:
     description: "Raptor tp6-4 cold page-load on Firefox"
     try-name: raptor-tp6-4-firefox-cold
     treeherder-symbol: Rap(tp6-c-4)
     tier: 2
     mozharness:
         extra-options:
             - --test=raptor-tp6-cold-4
 
-raptor-tp6m-1-refbrow-cold:
-    description: "Raptor tp6m-1 cold page-load on the reference browser"
-    try-name: raptor-tp6m-1-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-1)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-1
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-2-refbrow-cold:
-    description: "Raptor tp6m-2 cold page-load on the reference browser"
-    try-name: raptor-tp6m-2-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-2)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-2
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-3-refbrow-cold:
-    description: "Raptor tp6m-3 cold page-load on the reference browser"
-    try-name: raptor-tp6m-3-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-3)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-3
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-4-refbrow-cold:
-    description: "Raptor tp6m-4 cold page-load on the reference browser"
-    try-name: raptor-tp6m-4-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-4)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-4
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-5-refbrow-cold:
-    description: "Raptor tp6m-5 cold page-load on the reference browser"
-    try-name: raptor-tp6m-5-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-5)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-5
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-6-refbrow-cold:
-    description: "Raptor tp6m-6 cold page-load on the reference browser"
-    try-name: raptor-tp6m-6-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-6)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-6
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-7-refbrow-cold:
-    description: "Raptor tp6m-7 cold page-load on the reference browser"
-    try-name: raptor-tp6m-7-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-7)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-7
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-8-refbrow-cold:
-    description: "Raptor tp6m-8 cold page-load on the reference browser"
-    try-name: raptor-tp6m-8-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-8)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-8
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-9-refbrow-cold:
-    description: "Raptor tp6m-9 cold page-load on the reference browser"
-    try-name: raptor-tp6m-9-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-9)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-9
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-10-refbrow-cold:
-    description: "Raptor tp6m-10 cold page-load on the reference browser"
-    try-name: raptor-tp6m-10-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-10)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-10
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-11-refbrow-cold:
-    description: "Raptor tp6m-11 cold page-load on the reference browser"
-    try-name: raptor-tp6m-11-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-11)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-11
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-12-refbrow-cold:
-    description: "Raptor tp6m-12 cold page-load on the reference browser"
-    try-name: raptor-tp6m-12-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-12)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-12
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-13-refbrow-cold:
-    description: "Raptor tp6m-13 cold page-load on the reference browser"
-    try-name: raptor-tp6m-13-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-13)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-13
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-14-refbrow-cold:
-    description: "Raptor tp6m-14 cold page-load on the reference browser"
-    try-name: raptor-tp6m-14-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-14)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-14
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-15-refbrow-cold:
-    description: "Raptor tp6m-15 cold page-load on the reference browser"
-    try-name: raptor-tp6m-15-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-15)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-15
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-16-refbrow-cold:
-    description: "Raptor tp6m-16 cold page-load on the reference browser"
-    try-name: raptor-tp6m-16-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-16)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-16
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-17-refbrow-cold:
-    description: "Raptor tp6m-17 cold page-load on the reference browser"
-    try-name: raptor-tp6m-17-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-17)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-17
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-18-refbrow-cold:
-    description: "Raptor tp6m-18 cold page-load on the reference browser"
-    try-name: raptor-tp6m-18-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-18)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-18
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-19-refbrow-cold:
-    description: "Raptor tp6m-19 cold page-load on the reference browser"
-    try-name: raptor-tp6m-19-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-19)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-19
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-20-refbrow-cold:
-    description: "Raptor tp6m-20 cold page-load on the reference browser"
-    try-name: raptor-tp6m-20-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-20)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-20
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-21-refbrow-cold:
-    description: "Raptor tp6m-21 cold page-load on the reference browser"
-    try-name: raptor-tp6m-21-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-21)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-21
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-22-refbrow-cold:
-    description: "Raptor tp6m-22 cold page-load on the reference browser"
-    try-name: raptor-tp6m-22-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-22)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-22
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-23-refbrow-cold:
-    description: "Raptor tp6m-23 cold page-load on the reference browser"
-    try-name: raptor-tp6m-23-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-23)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-23
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivityy
-
-raptor-tp6m-24-refbrow-cold:
-    description: "Raptor tp6m-24 cold page-load on the reference browser"
-    try-name: raptor-tp6m-24-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-24)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-24
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-25-refbrow-cold:
-    description: "Raptor tp6m-25 cold page-load on the reference browser"
-    try-name: raptor-tp6m-25-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-25)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-25
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-26-refbrow-cold:
-    description: "Raptor tp6m-26 cold page-load on the reference browser"
-    try-name: raptor-tp6m-26-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-26)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-26
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
-raptor-tp6m-27-refbrow-cold:
-    description: "Raptor tp6m-27 cold page-load on the reference browser"
-    try-name: raptor-tp6m-27-refbrow-cold
-    treeherder-symbol: Rap-refbrow(tp6m-c-27)
-    run-on-projects: []
-    e10s: true
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: project.mobile.reference-browser.v2.raptor.latest.aarch64
-                name: target.apk
-            default:
-                index: project.mobile.reference-browser.v2.raptor.latest.arm
-                name: target.apk
-    tier: 2
-    mozharness:
-        extra-options:
-            - --test=raptor-tp6m-cold-27
-            - --app=refbrow
-            - --binary-path=org.mozilla.reference.browser.raptor
-            - --activity=org.mozilla.reference.browser.BrowserTestActivity
-
 raptor-ares6-firefox:
     description: "Raptor Ares6 on Firefox"
     variants: ["fission"]
     try-name: raptor-ares6-firefox
     treeherder-symbol: Rap(ares6)
     max-run-time: 2500
     tier: 3
     mozharness: