diff options
Diffstat (limited to 'taskcluster/gecko_taskgraph/transforms/test')
| -rw-r--r-- | taskcluster/gecko_taskgraph/transforms/test/other.py | 26 | ||||
| -rw-r--r-- | taskcluster/gecko_taskgraph/transforms/test/variant.py | 12 |
2 files changed, 22 insertions, 16 deletions
diff --git a/taskcluster/gecko_taskgraph/transforms/test/other.py b/taskcluster/gecko_taskgraph/transforms/test/other.py index 5d54467001..e01691c05a 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/other.py +++ b/taskcluster/gecko_taskgraph/transforms/test/other.py @@ -419,26 +419,20 @@ def setup_browsertime(config, tasks): "win32-chromedriver-122", "win32-chromedriver-123", ], - "windows.*-32.*": [ - "win32-chromedriver-122", - "win32-chromedriver-123", - "win32-chromedriver-124", - ], "windows.*-64.*": [ - "win32-chromedriver-122", - "win32-chromedriver-123", + "win64-chromedriver-123", "win64-chromedriver-124", ], } chromium_fetches = { - "linux.*": ["linux64-chromium"], - "macosx1015.*": ["mac-chromium"], - "macosx1400.*": ["mac-chromium-arm"], - "windows.*aarch64.*": ["win32-chromium"], - "windows.*-32.*": ["win32-chromium"], - "windows.*-64.*": ["win64-chromium"], - "android.*": ["linux64-chromium"], + "linux.*": ["linux64-chromiumdriver"], + "macosx1015.*": ["mac-chromiumdriver"], + "macosx1400.*": ["mac-chromiumdriver-arm"], + "windows.*aarch64.*": ["win32-chromiumdriver"], + "windows.*-32.*": ["win32-chromiumdriver"], + "windows.*-64.*": ["win64-chromiumdriver"], + "android.*": ["linux64-chromiumdriver"], } cd_extracted_name = { @@ -581,7 +575,9 @@ def enable_code_coverage(config, tasks): yield task continue task["mozharness"].setdefault("extra-options", []).append("--code-coverage") - task["instance-size"] = "xlarge" + task["instance-size"] = "xlarge-noscratch" + if "jittest" in task["test-name"]: + task["instance-size"] = "xlarge" # Temporarily disable Mac tests on mozilla-central if "mac" in task["build-platform"]: diff --git a/taskcluster/gecko_taskgraph/transforms/test/variant.py b/taskcluster/gecko_taskgraph/transforms/test/variant.py index bda91b2f25..6ee6c429f0 100644 --- a/taskcluster/gecko_taskgraph/transforms/test/variant.py +++ b/taskcluster/gecko_taskgraph/transforms/test/variant.py @@ -78,6 +78,14 @@ def split_variants(config, tasks): remaining_variants.append(name) return remaining_variants + def replace_task_items(task_key, variant_key): + for item in variant_key: + if isinstance(variant_key[item], dict): + task_key[item] = replace_task_items(task_key[item], variant_key[item]) + else: + task_key[item] = variant_key[item] + return task_key + def apply_variant(variant, task): task["description"] = variant["description"].format(**task) @@ -94,7 +102,9 @@ def split_variants(config, tasks): task["variant-suffix"] += suffix # Replace and/or merge the configuration. - task.update(variant.get("replace", {})) + + # we only want to update the leaf node, the the entire top level dict + task = replace_task_items(task, variant.get("replace", {})) return merge(task, variant.get("merge", {})) expired_variants = find_expired_variants(TEST_VARIANTS) |