Bug 1334920 - Add youtube and twitch external media tests to TC config. r?grenade
Rename the base external media tests from "external-media-tests" to
"external-media-tests-base", to disambiguate them from the other tests in the
suite, as well as the set of all external media tests.
Adjust tests that are run per platform so that all external media tests are run
on linux and windows. Adjust the platform tests so that they select the
external-media-tests set, rather than adding individual external media tests to
each platform set.
MozReview-Commit-ID: DRiQQA1BB9n
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -14,21 +14,23 @@
##
# Linux platforms (matching /linux.*/)
linux32/debug:
build-platform: linux/debug
test-sets:
- linux32-tests
+ - external-media-tests
linux32/opt:
build-platform: linux/opt
test-sets:
- linux32-tests
- linux32-opt-tests
+ - external-media-tests
linux64/debug:
build-platform: linux64/debug
test-sets:
- common-tests
- external-media-tests
- web-platform-tests
linux64/opt:
@@ -79,40 +81,44 @@ 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
windows7-32-vm/opt:
build-platform: win32/opt
test-sets:
- windows-vm-tests
+ - external-media-tests
# win32 gpu
#windows7-32/debug:
# build-platform: win32/debug
# test-sets:
# - windows-gpu-tests
#windows7-32/opt:
# build-platform: win32/opt
# test-sets:
# - windows-gpu-tests
# win64 vm
windows10-64-vm/debug:
build-platform: win64/debug
test-sets:
- windows-vm-tests
+ - external-media-tests
windows10-64-vm/opt:
build-platform: win64/opt
test-sets:
- windows-vm-tests
+ - external-media-tests
# win64 gpu
#windows10-64/debug:
# build-platform: win64/debug
# test-sets:
# - windows-gpu-tests
#windows10-64/opt:
# build-platform: win64/opt
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -39,17 +39,19 @@ common-tests:
- xpcshell
web-platform-tests:
- web-platform-tests
- web-platform-tests-reftests
- web-platform-tests-wdspec
external-media-tests:
- - external-media-tests
+ - external-media-tests-base
+ - external-media-tests-youtube
+ - external-media-tests-twitch
opt-only-tests:
- mochitest-valgrind
talos:
- talos-chrome
- talos-dromaeojs
- talos-g1
@@ -83,17 +85,16 @@ jsdcov-code-coverage-tests:
- mochitest-devtools-chrome
##
# Test sets still being greened up in various ways
windows-vm-tests:
- cppunit
#- crashtest
- - external-media-tests
#- gtest
#- jittest
- jsreftest
#- marionette
#- mochitest
#- mochitest-browser-chrome
- mochitest-devtools-chrome
- mochitest-jetpack
@@ -142,17 +143,16 @@ macosx64-tests-talos:
- talos-g4
- talos-other
- talos-svgr
- talos-tp5o
linux32-tests:
- cppunit
- crashtest
- - external-media-tests
- 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
@@ -84,17 +84,17 @@ crashtest:
- remove_executables.py
- unittests/mac_unittest.py
linux.*:
- unittests/linux_unittest.py
- remove_executables.py
extra-options:
- --reftest-suite=crashtest
-external-media-tests:
+external-media-tests-base:
description: "External Media Test run"
suite: external-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:
@@ -106,16 +106,64 @@ external-media-tests:
config:
by-test-platform:
windows.*:
- mediatests/taskcluster_windows_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)
+ e10s: false
+ tier: 2
+ max-run-time: 5400
+ docker-image: {"in-tree": "desktop1604-test"}
+ run-on-projects:
+ by-test-platform:
+ windows.*: ['mozilla-central', 'try']
+ default: ['all']
+ mozharness:
+ script: firefox_media_tests_taskcluster.py
+ config:
+ by-test-platform:
+ windows.*:
+ - mediatests/taskcluster_windows_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
+ 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']
+ default: ['all']
+ mozharness:
+ script: firefox_media_tests_taskcluster.py
+ config:
+ by-test-platform:
+ windows.*:
+ - mediatests/taskcluster_windows_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: