From b41082ac637f382785da76e608807af21ab6f341 Mon Sep 17 00:00:00 2001
From: Dave Hunt <dave.hunt@gmail.com>
Date: Sat, 3 Apr 2021 15:46:14 +0100
Subject: [PATCH] Bug 1670902 - Use WebRender platforms for Raptor performance
 tests

---
 taskcluster/ci/browsertime/kind.yml           |  4 ++--
 taskcluster/ci/config.yml                     |  1 -
 .../fenix_taskgraph/transforms/browsertime.py | 24 +++++++++----------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/taskcluster/ci/browsertime/kind.yml b/taskcluster/ci/browsertime/kind.yml
index 8a0ef3983..2a222037b 100644
--- a/taskcluster/ci/browsertime/kind.yml
+++ b/taskcluster/ci/browsertime/kind.yml
@@ -43,8 +43,8 @@ job-defaults:
         tier: 2
         platform:
             by-abi:
-                arm64-v8a: android-hw-p2-8-0-android-aarch64-shippable/opt
-                armeabi-v7a: android-hw-g5-7-0-arm7-api-16-shippable/opt
+                arm64-v8a: android-hw-p2-8-0-android-aarch64-shippable-qr/opt
+                armeabi-v7a: android-hw-g5-7-0-arm7-api-16-shippable-qr/opt
     worker-type:
         by-abi:
             armeabi-v7a: t-bitbar-gw-perf-g5
diff --git a/taskcluster/ci/config.yml b/taskcluster/ci/config.yml
index 4fb15565d..2ec9cdc7d 100644
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@@ -4,7 +4,6 @@ treeherder:
     group-names:
         'beta': 'Beta-related tasks with same APK configuration as Fennec'
         'Btime': 'Raptor-Browsertime tests'
-        'Btime-wr': 'Raptor-Browsertime tests with webrender enabled'
         'bump': 'Bump dependencies'
         'debug': 'Builds made for testing'
         'Fetch': 'Fetch and store content'
diff --git a/taskcluster/fenix_taskgraph/transforms/browsertime.py b/taskcluster/fenix_taskgraph/transforms/browsertime.py
index 544d06860..fbdea4aa9 100644
--- a/taskcluster/fenix_taskgraph/transforms/browsertime.py
+++ b/taskcluster/fenix_taskgraph/transforms/browsertime.py
@@ -77,16 +77,18 @@ def build_browsertime_task(config, tasks):
         abi = task["attributes"]["abi"]
         apk = task["attributes"]["apk"]
 
-        test_name = task.pop("test-name")
-
-        task["name"] = "{}-{}-{}".format(task["name"], build_type, abi)
-        task["description"] = "{}-{}".format(build_type, abi)
-
         for key in ("args", "treeherder.platform", "worker-type"):
             resolve_keyed_by(task, key, item_name=task["name"], **{"abi": abi})
 
         task["treeherder"] = inherit_treeherder_from_dep(task, signing)
 
+        test_name = task.pop("test-name")
+        platform = task["treeherder"]["platform"]
+
+        task_name = "{}-{}-{}-{}".format(platform, test_name, build_type, abi)
+        task["name"] = task_name
+        task["description"] = task_name
+
         extra_config = {
             "installer_url": "<signing/{}>".format(apk),
             "test_packages_url": "<geckoview-nightly/public/build/en-US/target.test_packages.json>",
@@ -150,15 +152,13 @@ def enable_webrender(config, tasks):
     for task in tasks:
         if not task.pop("web-render-only", False):
             newtask = copy.deepcopy(task)
+            newtask["name"] = newtask["name"].replace("-qr", "")
+            newtask["description"] = newtask["description"].replace("-qr", "")
+            newtask["treeherder"]["platform"] = newtask["treeherder"][
+                "platform"
+            ].replace("-qr", "")
             yield newtask
         task["run"]["command"].append("--enable-webrender")
-        task["name"] += "-wr"
-        task["description"] += "-wr"
-
-        # Setup group symbol
-        group, sym = task["treeherder"]["symbol"].split("(")
-        task["treeherder"]["symbol"] = "{}-wr({})".format(group, sym[:-1])
-
         yield task