Bug 1503776 - Add marionette-gpu job. r=jmaher

In order to reduce the cost of running marionette tests on a virtual machine
with a GPU, add a marionette-gpu job, and run the WebRender rollout test added
in the previous patch in this new job.

Depends on D10528

Differential Revision: https://phabricator.services.mozilla.com/D12241

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Chris Pearce 2018-11-20 12:32:50 +00:00
parent 38d726ef21
commit 5862a9afbb
8 changed files with 36 additions and 0 deletions

View File

@ -0,0 +1,5 @@
[DEFAULT]
run-if = buildapp == 'browser'
[test_pref_rollout_workaround.py]
skip-if = os != "win" # Bug 1503776, WebRender is only available on Windows at this stage.

View File

@ -7,3 +7,4 @@
MOCHITEST_MANIFESTS += ['mochitest/mochitest.ini']
BROWSER_CHROME_MANIFESTS += ['browser/browser.ini']
MOCHITEST_CHROME_MANIFESTS += ['chrome/chrome.ini']
MARIONETTE_GPU_MANIFESTS += ['marionette/manifest.ini']

View File

@ -139,6 +139,7 @@ ARCHIVE_FILES = {
'base': '',
'manifests': [
'testing/marionette/harness/marionette_harness/tests/unit-tests.ini',
'gfx/tests/marionette/manifest.ini',
],
# We also need the manifests and harness_unit tests
'pattern': 'testing/marionette/harness/marionette_harness/tests/**',

View File

@ -1855,6 +1855,10 @@ VARIABLES = {
"""List of manifest files defining marionette-layout tests.
"""),
'MARIONETTE_GPU_MANIFESTS': (ManifestparserManifestList, list,
"""List of manifest files defining marionette-gpu tests.
"""),
'MARIONETTE_UNIT_MANIFESTS': (ManifestparserManifestList, list,
"""List of manifest files defining marionette-unit tests.
"""),

View File

@ -47,3 +47,16 @@ marionette-headless:
mozharness:
extra-options:
- --headless
marionette-gpu:
description: "Marionette with GPU unittest run"
treeherder-symbol: MnG
max-run-time: 1800
instance-size: default
mozharness:
extra-options:
- --test-manifest gpu-unit-tests.ini
virtualization:
by-test-platform:
windows10-64.*: virtual-with-gpu
default: virtual

View File

@ -173,12 +173,14 @@ windows10-64-ccov/debug:
- desktop-screenshot-capture
- windows-reftest-gpu
- windows-talos
- marionette-gpu-tests
- windows-tests
- ccov-code-coverage-tests
windows10-64/debug:
build-platform: win64/debug
test-sets:
- marionette-gpu-tests
- windows-tests
- mochitest-headless
@ -188,6 +190,7 @@ windows10-64/opt:
- awsy
- desktop-screenshot-capture
- windows-talos
- marionette-gpu-tests
- windows-tests
- mochitest-headless
- raptor-firefox
@ -202,7 +205,9 @@ windows10-64-pgo/opt:
test-sets:
- awsy
- desktop-screenshot-capture
- marionette-gpu-tests
- windows-talos
- marionette-gpu-tests
- windows-tests
- raptor-firefox
@ -212,6 +217,7 @@ windows10-64-nightly/opt:
- awsy
- desktop-screenshot-capture
- desktop-instrumentation
- marionette-gpu-tests
- windows-tests
- raptor-chrome
@ -219,6 +225,7 @@ windows10-64-devedition/opt:
build-platform: win64-devedition-nightly/opt
test-sets:
- desktop-screenshot-capture
- marionette-gpu-tests
- windows-tests
windows10-64-asan/opt:

View File

@ -223,6 +223,9 @@ windows-talos:
- talos-tps
# - talos-h1 Bug 1487031 - Disabled for not finding actionable regressions
marionette-gpu-tests:
- marionette-gpu
macosx64-tests:
- cppunit
- crashtest

View File

@ -0,0 +1,2 @@
# graphics tests
[include:../../../../../gfx/tests/marionette/manifest.ini]