From 2c518aa08da9308481eb71b0936868c9bab06321 Mon Sep 17 00:00:00 2001 From: Shriram Kunchanapalli Date: Fri, 28 Apr 2017 12:19:13 -0400 Subject: [PATCH] Bug 1360582 - Move mochitest-media tests to run on 16.04. r=jmaher MozReview-Commit-ID: 9Kx72HIv3i9 --- taskcluster/ci/test/tests.yml | 1 + taskcluster/taskgraph/transforms/tests.py | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/taskcluster/ci/test/tests.yml b/taskcluster/ci/test/tests.yml index f98c175d9ad6..8b881c74f568 100644 --- a/taskcluster/ci/test/tests.yml +++ b/taskcluster/ci/test/tests.yml @@ -803,6 +803,7 @@ mochitest-media: treeherder-symbol: tc-M(mda) max-run-time: 5400 loopback-video: true + docker-image: {"in-tree": "desktop1604-test"} e10s: by-test-platform: macosx64/debug: true diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index e043c959345c..f5efac7e1477 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -387,18 +387,6 @@ def set_treeherder_machine_platform(config, tests): yield test -@transforms.add -def set_asan_docker_image(config, tests): - """Set the appropriate task.extra.treeherder.docker-image""" - # Linux64-asan has many leaks with running mochitest-media jobs - # on Ubuntu 16.04, please remove this when bug 1289209 is resolved - for test in tests: - if test['suite'] == 'mochitest/mochitest-media' and \ - test['build-platform'] == 'linux64-asan/opt': - test['docker-image'] = {"in-tree": "desktop-test"} - yield test - - @transforms.add def set_worker_implementation(config, tests): """Set the worker implementation based on the test platform."""