From 5af0b5d0b6817fac0e08a137cf53b26c2ffbe708 Mon Sep 17 00:00:00 2001 From: Julien Cristau Date: Fri, 21 Jun 2024 22:06:46 +0000 Subject: [PATCH] Bug 1902979 - add t-linux-xlarge-wayland worker type. r=jmaher a=RyanVM This switches the wayland wpt tasks to run on xlarge workers, like the corresponding x11 tasks. Original Revision: https://phabricator.services.mozilla.com/D214127 Differential Revision: https://phabricator.services.mozilla.com/D214232 --- taskcluster/config.yml | 5 +++++ taskcluster/gecko_taskgraph/transforms/test/worker.py | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/taskcluster/config.yml b/taskcluster/config.yml index e159330efea1..cda394cee831 100644 --- a/taskcluster/config.yml +++ b/taskcluster/config.yml @@ -872,6 +872,11 @@ workers: implementation: generic-worker os: linux worker-type: 't-linux-2204-wayland' + t-linux-xlarge-wayland: + provisioner: '{trust-domain}-t' + implementation: generic-worker + os: linux + worker-type: 't-linux-xlarge-2204-wayland' t-linux-wayland-vm: provisioner: '{trust-domain}-t' implementation: generic-worker diff --git a/taskcluster/gecko_taskgraph/transforms/test/worker.py b/taskcluster/gecko_taskgraph/transforms/test/worker.py index e1d02a66fd78..b8b19d8ac385 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/worker.py +++ b/taskcluster/gecko_taskgraph/transforms/test/worker.py @@ -173,7 +173,10 @@ def set_worker_type(config, tasks): task["worker-type"] = "t-linux-kvm" elif test_platform.startswith("linux") or test_platform.startswith("android"): if "wayland" in test_platform: - task["worker-type"] = "t-linux-wayland" + if task["instance-size"].startswith("xlarge"): + task["worker-type"] = "t-linux-xlarge-wayland" + else: + task["worker-type"] = "t-linux-wayland" elif task.get("suite", "") in ["talos", "raptor"] and not task[ "build-platform" ].startswith("linux64-ccov"): @@ -189,7 +192,7 @@ def set_worker_type(config, tasks): @transforms.add def set_wayland_env(config, tasks): for task in tasks: - if not task["worker-type"].startswith("t-linux-wayland"): + if "wayland" not in task["test-platform"]: yield task continue