Bug 1967322 - don't share test variant's environment across all tasks using it. r=ahal,taskgraph-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D250253
This commit is contained in:
Julien Cristau
2025-05-20 14:01:56 +00:00
committed by jcristau@mozilla.com
parent e14dff82ab
commit 3cb3dc1d78
2 changed files with 3 additions and 1 deletions

View File

@@ -172,6 +172,8 @@ def mozharness_test_on_docker(config, job, taskdesc):
# Set MOZ_ENABLE_WAYLAND env variables to enable Wayland backend. # Set MOZ_ENABLE_WAYLAND env variables to enable Wayland backend.
if "wayland" in job["label"]: if "wayland" in job["label"]:
env["MOZ_ENABLE_WAYLAND"] = "1" env["MOZ_ENABLE_WAYLAND"] = "1"
else:
assert "MOZ_ENABLE_WAYLAND" not in env
if mozharness.get("mochitest-flavor"): if mozharness.get("mochitest-flavor"):
env["MOCHITEST_FLAVOR"] = mozharness["mochitest-flavor"] env["MOCHITEST_FLAVOR"] = mozharness["mochitest-flavor"]

View File

@@ -114,7 +114,7 @@ def split_variants(config, tasks):
variant=name, variant=name,
) )
return merge(task, variant.get("merge", {})) return merge(task, deepcopy(variant.get("merge", {})))
expired_variants = find_expired_variants(TEST_VARIANTS) expired_variants = find_expired_variants(TEST_VARIANTS)
for task in tasks: for task in tasks: