Commit d4613540 authored by Geoff Brown's avatar Geoff Brown
Browse files

Bug 1598746 - Adjust some mochitest and reftest SCHEDULES.exclusive entries; r=ahal 

Use finer granularity for some reftest/mochitest SCHEDULES.exclusive entries,
so that reftest-plain does not run when only crashtests are modified, and
vice versa; similarly, break up mochitest into mochitest/browser-chrome/chrome/
a11y. Use schedules-component instead of category.

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

--HG--
extra : moz-landing-system : lando
parent 05c87fca

layout/tools/reftest/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 


with Files('**'):

    BUG_COMPONENT = ('Testing', 'Reftest')

    SCHEDULES.exclusive = ['reftest']

    SCHEDULES.exclusive = ['reftest', 'crashtest']



XPI_NAME = 'reftest'

USE_EXTENSION_MANIFEST = True

moz.build

+9 −5
Original line number Diff line number Diff line
@@ -80,19 +80,23 @@ with Files("**/reftest.list"): 


with Files("**/crashtest*.list"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

    SCHEDULES.exclusive = ['reftest']

    SCHEDULES.exclusive = ['crashtest']



with Files("**/a11y.ini"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

    SCHEDULES.exclusive = ['mochitest-a11y']



with Files("**/mochitest.ini"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

    SCHEDULES.exclusive = ['mochitest']

    SCHEDULES.exclusive = ['mochitest-plain']



with Files("**/browser.ini"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

    SCHEDULES.exclusive = ['mochitest']

    SCHEDULES.exclusive = ['mochitest-browser-chrome']



with Files("**/chrome.ini"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

    SCHEDULES.exclusive = ['mochitest']

    SCHEDULES.exclusive = ['mochitest-chrome']



with Files("**/xpcshell.ini"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']
@@ -104,7 +108,7 @@ with Files("**/reftest*/**"): 


with Files("**/crashtest*/**"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

    SCHEDULES.exclusive = ['reftest']

    SCHEDULES.exclusive = ['crashtest']



with Files("**/mochitest*/**"):

    SCHEDULES.inclusive += ['test-verify', 'test-verify-gpu']

python/mozbuild/mozbuild/schedules.py

+7 −3
Original line number Diff line number Diff line
@@ -42,19 +42,17 @@ EXCLUSIVE_COMPONENTS = [ 
    'linux',

    'macosx',

    'windows',

    # test suites

    # test suite categories

    'awsy',

    'condprofile',

    'cppunittest',

    'firefox-ui',

    'geckoview',

    'geckoview-junit',

    'gtest',

    'marionette',

    'mochitest',

    'raptor',

    'reftest',

    'robocop',

    'talos',

    'telemetry-tests-client',

    'xpcshell',
@@ -63,6 +61,12 @@ EXCLUSIVE_COMPONENTS = [ 
    'web-platform-tests-crashtests',

    'web-platform-tests-reftests',

    'web-platform-tests-wdspec',

    # specific test suites via schedules-component

    'mochitest-a11y',

    'mochitest-browser-chrome',

    'mochitest-chrome',

    'mochitest-plain',

    'crashtest',

]

EXCLUSIVE_COMPONENTS = sorted(EXCLUSIVE_COMPONENTS)

ALL_COMPONENTS = INCLUSIVE_COMPONENTS + EXCLUSIVE_COMPONENTS

taskcluster/ci/test/mochitest.yml

+12 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ job-defaults: 
mochitest-plain:

    description: "Mochitest plain run"

    treeherder-symbol: M()

    schedules-component: mochitest-plain

    loopback-video: true

    tier: default

    chunks:
@@ -85,6 +86,7 @@ mochitest-plain: 
mochitest-a11y:

    description: "Mochitest a11y run"

    treeherder-symbol: M(a11y)

    schedules-component: mochitest-a11y

    loopback-video: true

    tier: default

    e10s: false
@@ -97,6 +99,7 @@ mochitest-browser-chrome: 
    suite:

        name: mochitest-browser-chrome

    treeherder-symbol: M(bc)

    schedules-component: mochitest-browser-chrome

    loopback-video: true

    fission-run-on-projects:

        by-test-platform:
@@ -159,6 +162,7 @@ browser-screenshots: 
mochitest-chrome:

    description: "Mochitest chrome run"

    treeherder-symbol: M(c)

    schedules-component: mochitest-chrome

    loopback-video: true

    tier: default

    chunks:
@@ -211,6 +215,7 @@ mochitest-plain-gpu: 
    suite:

        name: mochitest-plain-gpu

    treeherder-symbol: M(gpu)

    schedules-component: mochitest-plain

    loopback-video: true

    fission-run-on-projects: []

    fission-tier: 2
@@ -250,6 +255,7 @@ mochitest-chrome-gpu: 
mochitest-media:

    description: "Mochitest media run"

    treeherder-symbol: M(mda)

    schedules-component: mochitest-plain

    max-run-time:

        by-test-platform:

            windows10-64-ccov/.*: 7200
@@ -335,6 +341,7 @@ mochitest-valgrind: 
mochitest-webgl1-core:

    description: "Mochitest webgl1-core run"

    treeherder-symbol: M(gl1c)

    schedules-component: mochitest-plain

    virtualization: virtual-with-gpu

    e10s: true

    loopback-video: true
@@ -351,6 +358,7 @@ mochitest-webgl1-core: 
mochitest-webgl1-ext:

    description: "Mochitest webgl1-ext run"

    treeherder-symbol: M(gl1e)

    schedules-component: mochitest-plain

    virtualization: virtual-with-gpu

    chunks:

        by-test-platform:
@@ -369,6 +377,7 @@ mochitest-webgl1-ext: 
mochitest-webgl2-core:

    description: "Mochitest webgl2-core run"

    treeherder-symbol: M(gl2c)

    schedules-component: mochitest-plain

    virtualization: virtual-with-gpu

    chunks:

        by-test-platform:
@@ -387,6 +396,7 @@ mochitest-webgl2-core: 
mochitest-webgl2-ext:

    description: "Mochitest webgl2-ext run"

    treeherder-symbol: M(gl2e)

    schedules-component: mochitest-plain

    virtualization: virtual-with-gpu

    chunks: 4

    e10s: true
@@ -402,6 +412,7 @@ mochitest-webgl2-ext: 
mochitest-webgl2-deqp:

    description: "Mochitest webgl2-deqp run"

    treeherder-symbol: M(gl2d)

    schedules-component: mochitest-plain

    run-on-projects: []  # Don't run this for now.

    virtualization: virtual-with-gpu

    chunks: 4
@@ -418,6 +429,7 @@ mochitest-webgl2-deqp: 
mochitest-webgpu:

    description: "Mochitest webgpu run"

    treeherder-symbol: M(webgpu)

    schedules-component: mochitest-plain

    virtualization: virtual-with-gpu

    e10s: true

    loopback-video: true

taskcluster/ci/test/reftest.yml

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ job-defaults: 


crashtest:

    description: "Crashtest run"

    schedules-component: crashtest

    treeherder-symbol: R(C)

    chunks:

        by-test-platform: