Bug 1642329 - Migrate speedometer benchmarks from raptor to browsertime on android r=perftest-reviewers,sparky

Differential Revision: https://phabricator.services.mozilla.com/D94292
2020-10-22 14:06:25 +00:00 · 2020-10-22 14:06:25 +00:00 · bc0d2e2fa2
--- a/taskcluster/ci/test/browsertime-mobile.yml
+++ b/taskcluster/ci/test/browsertime-mobile.yml
@ -321,19 +321,19 @@ browsertime-tp6m-profiling:

 browsertime-speedometer-mobile:
    description: "Browsertime Speedometer on Android"
-    apps: ["geckoview", "fenix", "fennec"]
+    apps: ["geckoview", "fenix", "fennec", "chrome-m"]
    tier:
        by-app:
            fenix: 1
            default: 3
    run-on-projects:
        by-app:
-            fenix: []
-            default:
+            geckoview:
                by-test-platform:
-                    android-hw-p2-.*aarch64.*/pgo: ["mozilla-central"]
-                    android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"]
+                    android-hw-g5-7-0-arm7-api-16-shippable/opt: ['trunk', 'mozilla-beta']
+                    android-hw-p2-8-0-android-aarch64-shippable/opt: ['trunk', 'mozilla-beta']
                    default: []
+            default: []
    treeherder-symbol: Btime(sp)
    mozharness:
        extra-options:
--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@ -36,8 +36,6 @@ jobs-from:
    - raptor.yml
    - raptor-chrome.yml
    - raptor-chromium.yml
-    - raptor-fenix.yml
-    - raptor-fennec68.yml
    - raptor-gve.yml
    - raptor-refbrow.yml
    - reftest.yml
--- a/taskcluster/ci/test/raptor-fenix.yml
+++ b/taskcluster/ci/test/raptor-fenix.yml
@ -1,37 +0,0 @@
-# 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
-    run-on-projects: []
-    test-manifest-loader: null  # don't load tests in the taskgraph
-    tier: 1
-    target:
-        by-test-platform:
-            android-hw.*-aarch64.*/.*:
-                index: mobile.v2.fenix.nightly.latest.arm64-v8a
-                name: build/arm64-v8a/target.apk
-            default:
-                index: mobile.v2.fenix.nightly.latest.armeabi-v7a
-                name: build/armeabi-v7a/target.apk
-    e10s: true
-    virtualization: hardware
-    mozharness:
-        script: raptor_script.py
-        config:
-            - raptor/android_hw_config.py
-        extra-options:
-            - --app=fenix
-            - --binary-path=org.mozilla.fenix
-            - --activity=org.mozilla.fenix.IntentReceiverActivity
-
-raptor-speedometer-fenix:
-    description: "Raptor Speedometer on Fenix"
-    try-name: raptor-speedometer-fenix
-    treeherder-symbol: Rap-fenix(sp)
-    max-run-time: 2000
-    mozharness:
-        extra-options:
-            - --test=raptor-speedometer
--- a/taskcluster/ci/test/raptor-fennec68.yml
+++ b/taskcluster/ci/test/raptor-fennec68.yml
@ -1,36 +0,0 @@
-# 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: 2700
-    suite: raptor
-    run-on-projects: []
-    tier: 2
-    target:
-        by-test-platform:
-            android-hw-p2-8-0-android-aarch64.*:
-                index: gecko.v2.mozilla-esr68.signed-nightly.nightly.latest.mobile.android-aarch64-release-opt
-                name: build/target.apk
-            default:
-                index: gecko.v2.mozilla-esr68.signed-nightly.nightly.latest.mobile.android-api-16-release-opt
-                name: build/target.apk
-    virtualization: hardware
-    test-manifest-loader: null  # don't load tests in the taskgraph
-    mozharness:
-        script: raptor_script.py
-        config:
-            - raptor/android_hw_config.py
-        extra-options:
-            - --no-conditioned-profile
-
-raptor-speedometer-fennec68:
-    description: "Raptor Speedometer on Fennec68"
-    try-name: raptor-speedometer-fennec68
-    treeherder-symbol: Rap(sp-f68)
-    max-run-time: 2000
-    mozharness:
-        extra-options:
-            - --test=raptor-speedometer-fennec68
-            - --app=fennec
-            - --binary=org.mozilla.firefox
--- a/taskcluster/ci/test/raptor-gve.yml
+++ b/taskcluster/ci/test/raptor-gve.yml
@ -24,27 +24,6 @@ job-defaults:
    optimization:
        skip-unless-backstop: null

-raptor-speedometer-geckoview:
-    description: "Raptor Speedometer on GeckoView"
-    try-name: raptor-speedometer-geckoview
-    treeherder-symbol: Rap(sp)
-    run-on-projects:
-        by-test-platform:
-            android-hw-.*(?<!-shippable)/opt: []
-            android-hw-p2-.*api-16/pgo: []
-            android-hw-p2-.*aarch64.*/pgo: ['trunk', 'mozilla-beta']
-            android-hw-p2-.*aarch64-shippable/opt: ['trunk', 'mozilla-beta']
-            android-hw-g5.*/pgo: ['trunk', 'mozilla-beta']
-            android-hw-g5.*-shippable/opt: ['trunk', 'mozilla-beta']
-            default: ['mozilla-central', 'mozilla-beta']
-    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-cpu-memory:
    description: "Raptor Speedometer cpu/memory on GeckoView"
    try-name: raptor-speedometer-geckoview-cpu-memory
--- a/taskcluster/ci/test/raptor-refbrow.yml
+++ b/taskcluster/ci/test/raptor-refbrow.yml
@ -83,16 +83,6 @@ raptor-scn-cpu-memory-power-idle-bg-refbrow:
            - --power-test
            - --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)
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@ -468,7 +468,6 @@ android-hw-g5-7-0-arm7-api-16/opt:
    build-platform: android-api-16/opt
    test-sets:
        - android-hw-arm7-browsertime
-        - android-hw-arm7-raptor
        - android-hw-arm7-raptor-cpu-memory
        - android-hw-arm7-raptor-cpu-memory-power
        - raptor-fetch-geckoview
@ -477,7 +476,6 @@ android-hw-g5-7-0-arm7-api-16-shippable/opt:
    build-platform: android-api-16-shippable/opt
    test-sets:
        - android-hw-arm7-browsertime
-        - android-hw-arm7-raptor
        - android-hw-arm7-raptor-cpu-memory
        - android-hw-arm7-raptor-cpu-memory-power
        - raptor-fetch-geckoview
@ -489,7 +487,6 @@ android-hw-p2-8-0-arm7-api-16/opt:
    test-sets:
        - android-hw-arm7-browsertime
        - android-hw-arm7-pgo-unittests
-        - android-hw-arm7-raptor
        - android-hw-arm7-raptor-cpu-memory
        - android-hw-arm7-raptor-cpu-memory-power
        - raptor-fetch-geckoview
@ -499,7 +496,6 @@ android-hw-p2-8-0-arm7-api-16-shippable/opt:
    test-sets:
        - android-hw-arm7-browsertime
        - android-hw-arm7-pgo-unittests
-        - android-hw-arm7-raptor
        - android-hw-arm7-raptor-cpu-memory
        - android-hw-arm7-raptor-cpu-memory-power
        - raptor-fetch-geckoview
@ -529,7 +525,6 @@ android-hw-p2-8-0-android-aarch64/opt:
    test-sets:
        - android-hw-aarch64-browsertime
        - android-hw-aarch64-opt-unittests
-        - android-hw-aarch64-raptor
        - android-hw-aarch64-raptor-cpu-memory
        - android-hw-aarch64-raptor-cpu-memory-power

@ -538,7 +533,6 @@ android-hw-p2-8-0-android-aarch64-shippable/opt:
    test-sets:
        - android-hw-aarch64-browsertime
        - android-hw-aarch64-pgo-unittests
-        - android-hw-aarch64-raptor
        - android-hw-aarch64-raptor-cpu-memory
        - android-hw-aarch64-raptor-cpu-memory-power

--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@ -498,18 +498,6 @@ android-hw-aarch64-qr:
    - mochitest-webgl1-ext
    - mochitest-webgl2-core

-android-hw-arm7-raptor:
-    - raptor-speedometer-geckoview
-    - raptor-speedometer-refbrow
-    - raptor-speedometer-fenix
-    - raptor-speedometer-fennec68
-
-android-hw-aarch64-raptor:
-    - raptor-speedometer-geckoview
-    - raptor-speedometer-refbrow
-    - raptor-speedometer-fenix
-    - raptor-speedometer-fennec68
-
 android-hw-arm7-raptor-cpu-memory:
    - raptor-speedometer-geckoview-cpu-memory
    - raptor-scn-cpu-memory-idle-geckoview
--- a/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini
+++ b/testing/raptor/raptor/tests/benchmarks/raptor-speedometer.ini
@ -25,23 +25,3 @@ apps = chrome

 [raptor-speedometer-chromium]
 apps = chromium
-
-[raptor-speedometer-geckoview]
-page_timeout = 420000 # 7 mins
-page_cycles = 1
-apps = geckoview
-
-[raptor-speedometer-refbrow]
-page_timeout = 420000
-page_cycles = 1
-apps = refbrow
-
-[raptor-speedometer-fenix]
-page_timeout = 420000
-page_cycles = 1
-apps = fenix
-
-[raptor-speedometer-fennec68]
-page_timeout = 420000
-page_cycles = 1
-apps = fennec
--- a/testing/raptor/test/test_manifest.py
+++ b/testing/raptor/test/test_manifest.py
@ -313,22 +313,22 @@ def test_get_raptor_test_list_add_test_url_params(create_args):

 def test_get_raptor_test_list_refbrow(create_args):
    args = create_args(app="refbrow",
-                       test="raptor-speedometer",
+                       test="speedometer",
                       browser_cycles=1)

    test_list = get_raptor_test_list(args, mozinfo.os)
    assert len(test_list) == 1
-    assert test_list[0]['name'] == 'raptor-speedometer-refbrow'
+    assert test_list[0]['name'] == 'speedometer'


 def test_get_raptor_test_list_fenix(create_args):
    args = create_args(app="fenix",
-                       test="raptor-speedometer",
+                       test="speedometer",
                       browser_cycles=1)

    test_list = get_raptor_test_list(args, mozinfo.os)
-    # we don't have any actual fenix tests yet
    assert len(test_list) == 1
+    assert test_list[0]['name'] == 'speedometer'


 def test_add_test_url_params_with_single_extra_param():