From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:14:29 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../gecko_taskgraph/transforms/test/other.py | 29 ++++++++++++++++------ .../gecko_taskgraph/transforms/test/raptor.py | 23 +++++++++++++++++ 2 files changed, 45 insertions(+), 7 deletions(-) (limited to 'taskcluster/gecko_taskgraph/transforms/test') diff --git a/taskcluster/gecko_taskgraph/transforms/test/other.py b/taskcluster/gecko_taskgraph/transforms/test/other.py index dc258ef97a..b8cb95cff7 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/other.py +++ b/taskcluster/gecko_taskgraph/transforms/test/other.py @@ -16,6 +16,7 @@ from taskgraph.util.taskcluster import get_artifact_path, get_index_url from voluptuous import Any, Optional, Required from gecko_taskgraph.transforms.test.variant import TEST_VARIANTS +from gecko_taskgraph.util.perftest import is_external_browser from gecko_taskgraph.util.platforms import platform_family from gecko_taskgraph.util.templates import merge @@ -259,6 +260,20 @@ def handle_keyed_by(config, tasks): yield task +@transforms.add +def setup_raptor_external_browser_platforms(config, tasks): + for task in tasks: + if task["suite"] != "raptor": + yield task + continue + + if is_external_browser(task["try-name"]): + task["build-platform"] = "linux64/opt" + task["build-label"] = "build-linux64/opt" + + yield task + + @transforms.add def set_target(config, tasks): for task in tasks: @@ -308,25 +323,25 @@ def setup_browsertime(config, tasks): ts = { "by-test-platform": { - "android.*": ["browsertime", "linux64-geckodriver", "linux64-node-16"], - "linux.*": ["browsertime", "linux64-geckodriver", "linux64-node-16"], + "android.*": ["browsertime", "linux64-geckodriver", "linux64-node"], + "linux.*": ["browsertime", "linux64-geckodriver", "linux64-node"], "macosx1015.*": [ "browsertime", "macosx64-geckodriver", - "macosx64-node-16", + "macosx64-node", ], "macosx1400.*": [ "browsertime", "macosx64-aarch64-geckodriver", - "macosx64-aarch64-node-16", + "macosx64-aarch64-node", ], "windows.*aarch64.*": [ "browsertime", "win32-geckodriver", - "win32-node-16", + "win32-node", ], - "windows.*-32.*": ["browsertime", "win32-geckodriver", "win32-node-16"], - "windows.*-64.*": ["browsertime", "win64-geckodriver", "win64-node-16"], + "windows.*-32.*": ["browsertime", "win32-geckodriver", "win32-node"], + "windows.*-64.*": ["browsertime", "win64-geckodriver", "win64-node"], }, } diff --git a/taskcluster/gecko_taskgraph/transforms/test/raptor.py b/taskcluster/gecko_taskgraph/transforms/test/raptor.py index 0667d22bb2..18e21e6a1e 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/raptor.py +++ b/taskcluster/gecko_taskgraph/transforms/test/raptor.py @@ -10,6 +10,7 @@ from voluptuous import Extra, Optional, Required from gecko_taskgraph.transforms.test import test_description_schema from gecko_taskgraph.util.copy_task import copy_task +from gecko_taskgraph.util.perftest import is_external_browser transforms = TransformSequence() task_transforms = TransformSequence() @@ -316,6 +317,28 @@ def add_extra_options(config, tests): yield test +@transforms.add +def modify_mozharness_configs(config, tests): + for test in tests: + if not is_external_browser(test["app"]): + yield test + continue + + test_platform = test["test-platform"] + mozharness = test.setdefault("mozharness", {}) + if "mac" in test_platform: + mozharness["config"] = ["raptor/mac_external_browser_config.py"] + elif "windows" in test_platform: + mozharness["config"] = ["raptor/windows_external_browser_config.py"] + elif "linux" in test_platform: + mozharness["config"] = ["raptor/linux_external_browser_config.py"] + elif "android" in test_platform: + test["target"] = "target.tar.bz2" + mozharness["config"] = ["raptor/android_hw_external_browser_config.py"] + + yield test + + @task_transforms.add def add_scopes_and_proxy(config, tasks): for task in tasks: -- cgit v1.2.3