commit 56d04b3948c749a08a75afe9975ff782ea66d99f
parent f05143e6fc6e61e2484a5432fc3d5cc139e0a312
Author: Joel Maher <joel.maher@gmail.com>
Date: Mon, 24 Nov 2025 21:55:47 +0000
Bug 2001434 - move marionette suite to marionette-integration. r=whimboo,taskgraph-reviewers,releng-reviewers,ahal
Differential Revision: https://phabricator.services.mozilla.com/D273503
Diffstat:
10 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/python/mozbuild/mozbuild/schedules.py b/python/mozbuild/mozbuild/schedules.py
@@ -55,7 +55,8 @@ EXCLUSIVE_COMPONENTS = [
"fuzztest",
"geckoview-junit",
"gtest",
- "marionette",
+ "marionette-unittest",
+ "marionette-integration",
"mochitest",
"raptor",
"reftest",
diff --git a/taskcluster/gecko_taskgraph/test/test_util_chunking.py b/taskcluster/gecko_taskgraph/test/test_util_chunking.py
@@ -239,8 +239,6 @@ def test_get_runtimes(platform, suite):
@pytest.mark.parametrize(
"platform,suite,exception",
[
- ("nonexistent_platform", "nonexistent_suite", KeyError),
- ("unix", "nonexistent_suite", KeyError),
("unix", "", TypeError),
("", "", TypeError),
("", "nonexistent_suite", TypeError),
diff --git a/taskcluster/gecko_taskgraph/transforms/test/os_integration.py b/taskcluster/gecko_taskgraph/transforms/test/os_integration.py
@@ -18,9 +18,9 @@ def maybe_setup_os_integration(config, tasks):
return
for task in tasks:
- # Tags are ignored for raptor / talos. Marionette doesn't
- # support dynamic chunking.
- if task["suite"] in ("raptor", "talos", "marionette"):
+ # Tags are ignored for raptor / talos. Marionette unittest
+ # doesn't support dynamic chunking.
+ if task["suite"] in ("raptor", "talos", "marionette-unittest"):
yield task
continue
diff --git a/taskcluster/gecko_taskgraph/util/chunking.py b/taskcluster/gecko_taskgraph/util/chunking.py
@@ -160,7 +160,7 @@ def get_runtimes(platform, suite_name):
raise OSError(f"manifest runtime file at {path} not found.")
with open(path) as fh:
- return json.load(fh)[suite_name]
+ return json.load(fh).get(suite_name, {})
def chunk_manifests(suite, platform, chunks, manifests):
diff --git a/taskcluster/kinds/test/marionette.yml b/taskcluster/kinds/test/marionette.yml
@@ -3,7 +3,6 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
---
task-defaults:
- suite: marionette
mozharness:
script: marionette.py
config:
@@ -50,16 +49,17 @@ marionette-unittest:
default: 1800
instance-size: default
chunks: 1
- suite: marionette
+ suite: marionette-unittest
test-manifest-loader: null # don't load in taskgraph
mozharness:
extra-options:
- --subsuite=unittest
- --test-manifest=unit/unit-tests.toml
-marionette:
+marionette-integration:
description: "Marionette integration run"
treeherder-symbol: Mn()
+ suite: marionette-integration
variants:
- webrender-sw
- headless
diff --git a/taskcluster/test_configs/os-integration.yml b/taskcluster/test_configs/os-integration.yml
@@ -26,7 +26,7 @@
- windows11-64-24h2/opt
- windows11-64-24h2/debug
unittest_suite: &unittest-suites
- - marionette
+ - marionette-integration
- mochitest-browser-chrome
- mochitest-browser-media
- mochitest-chrome
diff --git a/taskcluster/test_configs/test-sets.yml b/taskcluster/test_configs/test-sets.yml
@@ -172,7 +172,7 @@ linux-tests:
- gtest
# - jittest # See comment in linux-ccov-tests set.
- jsreftest
- - marionette
+ - marionette-integration
- marionette-unittest
- mochitest-a11y
- mochitest-browser-a11y
@@ -204,7 +204,7 @@ linux-2404-tsan-tests:
- gtest
# - jittest # See comment in linux-ccov-tests set.
- jsreftest
- - marionette
+ - marionette-integration
- marionette-unittest
- mochitest-a11y
- mochitest-browser-a11y
@@ -243,7 +243,7 @@ linux2204-wayland-tests:
- firefox-ui-functional
- gtest
- jsreftest
- - marionette
+ - marionette-integration
- marionette-unittest
- mochitest-a11y
- mochitest-browser-a11y
@@ -276,7 +276,7 @@ windows32-tests:
- gtest
- firefox-ui-functional
- jsreftest
- - marionette
+ - marionette-integration
- marionette-unittest
- mochitest-a11y
- mochitest-browser-a11y
@@ -321,7 +321,7 @@ windows11-24h2-tests:
- firefox-ui-functional
- gtest
- jsreftest
- - marionette
+ - marionette-integration
- marionette-unittest
- mochitest-a11y
- mochitest-browser-a11y
@@ -443,7 +443,7 @@ macosx1470-64-tests:
- gtest
- jittest
- jsreftest
- - marionette
+ - marionette-integration
- marionette-unittest
- mochitest-a11y
- mochitest-browser-a11y
diff --git a/testing/marionette/moz.build b/testing/marionette/moz.build
@@ -8,6 +8,10 @@ with Files("**"):
BUG_COMPONENT = ("Testing", "Marionette Client and Harness")
with Files("harness/**"):
- SCHEDULES.exclusive = ["marionette", "firefox-ui"]
+ SCHEDULES.exclusive = [
+ "firefox-ui",
+ "marionette-integration",
+ "marionette-unittest",
+ ]
SPHINX_PYTHON_PACKAGE_DIRS += ["client/marionette_driver"]
diff --git a/testing/mozbase/moztest/moztest/resolve.py b/testing/mozbase/moztest/moztest/resolve.py
@@ -69,7 +69,7 @@ TEST_SUITES = {
"mach_command": "firefox-ui-update",
"kwargs": {},
},
- "marionette": {
+ "marionette-integration": {
"aliases": ("mn",),
"build_flavor": "marionette",
"mach_command": "marionette-test",
@@ -447,7 +447,8 @@ _test_flavors = {
"crashtest": "crashtest",
"firefox-ui-functional": "firefox-ui-functional",
"firefox-ui-update": "firefox-ui-update",
- "marionette": "marionette",
+ "marionette-integration": "marionette-integration",
+ "marionette-unittest": "marionette-unittest",
"mochitest": "mochitest-plain",
"puppeteer": "puppeteer",
"python": "python",
diff --git a/testing/mozharness/scripts/marionette.py b/testing/mozharness/scripts/marionette.py
@@ -163,7 +163,7 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin, CodeCoverageM
{
"action": "store",
"dest": "subsuite",
- "default": "marionette",
+ "default": "marionette-integration",
"help": "Selects test paths from test-manifests.active",
},
],
