Bug 1372051 - Remove task cluster configuration for external media tests. r?dustin
MozReview-Commit-ID: KV9O6ZSP6z7
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -132,24 +132,21 @@ linux64-jsdcov/opt:
##
# Windows platforms (matching /windows.*/)
# win32 vm
windows7-32-vm/debug:
build-platform: win32/debug
test-sets:
- windows-vm-tests
- - external-media-tests
- headless
windows7-32-vm/opt:
build-platform: win32/opt
test-sets:
- windows-vm-tests
- - external-media-tests
- - external-media-tests-slow
- awsy
- desktop-screenshot-capture
- headless
# win32 gpu
windows7-32/debug:
build-platform: win32/debug
test-sets:
@@ -160,24 +157,21 @@ windows7-32/opt:
- windows-gpu-tests
- desktop-screenshot-capture
# win64 vm
windows10-64-vm/debug:
build-platform: win64/debug
test-sets:
- windows-vm-tests
- - external-media-tests
- headless
windows10-64-vm/opt:
build-platform: win64/opt
test-sets:
- windows-vm-tests
- - external-media-tests
- - external-media-tests-slow
- awsy
- desktop-screenshot-capture
- headless
# win64 gpu
windows10-64/debug:
build-platform: win64/debug
test-sets:
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -38,24 +38,16 @@ common-tests:
- reftest-no-accel
- xpcshell
web-platform-tests:
- web-platform-tests
- web-platform-tests-reftests
- web-platform-tests-wdspec
-external-media-tests:
- - external-media-tests-base
- - external-media-tests-youtube
-
-external-media-tests-slow:
- # twitch tests are too slow and stall under debug, give them their own special set
- - external-media-tests-twitch
-
opt-only-tests:
- mochitest-valgrind
talos:
- talos-chrome
- talos-dromaeojs
- talos-g1
- talos-g2
@@ -142,18 +134,16 @@ windows-gpu-tests:
# these tests currently run on hardware, but may migrate above when validated
# see https://bugzilla.mozilla.org/show_bug.cgi?id=1280474#c36
# - mochitest-chrome
# - mochitest-clipboard
macosx64-tests:
- cppunit
- crashtest
- - external-media-tests-base
- - external-media-tests-youtube
- firefox-ui-functional-local
- firefox-ui-functional-remote
- gtest
- jittest
- jsreftest
- marionette
- mochitest
- mochitest-a11y
--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -108,104 +108,16 @@ crashtest:
- remove_executables.py
extra-options:
- --reftest-suite=crashtest
tier:
by-test-platform:
linux64-qr/.*: 1
default: default
-external-media-tests-base:
- description: "External Media Test run"
- suite: external-media-tests
- try-name: 'media-tests'
- treeherder-symbol: tc-VP(b-m)
- e10s: false
- tier: 2
- max-run-time: 5400
- docker-image: {"in-tree": "desktop1604-test"}
- run-on-projects:
- by-test-platform:
- windows.*: ['mozilla-central', 'try']
- windows7-32-vm/debug: built-projects
- windows7-32/debug: built-projects
- default: built-projects
- mozharness:
- script: firefox_media_tests_taskcluster.py
- config:
- by-test-platform:
- windows.*:
- - mediatests/taskcluster_windows_config.py
- macosx.*:
- - mediatests/taskcluster_posix_config.py
- default:
- - mediatests/taskcluster_posix_config.py
- - remove_executables.py
-
-external-media-tests-twitch:
- description: "External Media Test Twitch run"
- suite: external-media-tests/twitch
- treeherder-symbol: tc-VP(b-t)
- try-name: media-twitch-tests
- e10s: false
- instance-size:
- by-test-platform:
- default: default
- tier: 2
- max-run-time: 5400
- docker-image: {"in-tree": "desktop1604-test"}
- run-on-projects:
- by-test-platform:
- windows.*: ['mozilla-central', 'try']
- windows7-32-vm/debug: built-projects
- windows7-32/debug: built-projects
- default: built-projects
- mozharness:
- script: firefox_media_tests_taskcluster.py
- config:
- by-test-platform:
- windows.*:
- - mediatests/taskcluster_windows_config.py
- macosx.*:
- - mediatests/taskcluster_posix_config.py
- default:
- - mediatests/taskcluster_posix_config.py
- - remove_executables.py
- extra-options:
- - "--suite=media-twitch-tests"
-
-external-media-tests-youtube:
- description: "External Media Test Youtube run"
- suite: external-media-tests/youtube
- try-name: media-youtube-tests
- treeherder-symbol: tc-VP(b-y)
- e10s: false
- tier: 2
- max-run-time: 5400
- docker-image: {"in-tree": "desktop1604-test"}
- run-on-projects:
- by-test-platform:
- windows.*: ['mozilla-central', 'try']
- windows7-32-vm/debug: built-projects
- windows7-32/debug: built-projects
- default: built-projects
- mozharness:
- script: firefox_media_tests_taskcluster.py
- config:
- by-test-platform:
- windows.*:
- - mediatests/taskcluster_windows_config.py
- macosx.*:
- - mediatests/taskcluster_posix_config.py
- default:
- - mediatests/taskcluster_posix_config.py
- - remove_executables.py
- extra-options:
- - "--suite=media-youtube-tests"
-
firefox-ui-functional-local:
description: "Firefox-ui-tests functional run"
suite: "firefox-ui/functional local"
treeherder-symbol: tc-Fxfn-l(en-US)
max-run-time: 5400
tier: 1
docker-image: {"in-tree": "desktop1604-test"}
mozharness:
--- a/taskcluster/taskgraph/try_option_syntax.py
+++ b/taskcluster/taskgraph/try_option_syntax.py
@@ -57,17 +57,16 @@ UNITTEST_ALIASES = {
# prefixes. For example, the first example above would replace "foo-7"
# with "foobar-7". Note that a few aliases allowed chunks to be specified
# without a leading `-`, for example 'mochitest-dt1'. That's no longer
# supported.
'cppunit': alias_prefix('cppunit'),
'crashtest': alias_prefix('crashtest'),
'crashtest-e10s': alias_prefix('crashtest-e10s'),
'e10s': alias_contains('e10s'),
- 'external-media-tests': alias_prefix('external-media-tests'),
'firefox-ui-functional': alias_prefix('firefox-ui-functional'),
'firefox-ui-functional-e10s': alias_prefix('firefox-ui-functional-e10s'),
'gaia-js-integration': alias_contains('gaia-js-integration'),
'gtest': alias_prefix('gtest'),
'jittest': alias_prefix('jittest'),
'jittests': alias_prefix('jittest'),
'jsreftest': alias_prefix('jsreftest'),
'jsreftest-e10s': alias_prefix('jsreftest-e10s'),