Bug 1640278 - Fixup run-on-projects verification failures. r=sylvestre

This is in-part a followup to 1638260 which fixed some cases of this problem.

Differential Revision: https://phabricator.services.mozilla.com/D76746
This commit is contained in:
Justin Wood 2020-06-05 14:52:03 +00:00
Родитель b1ec9e9331
Коммит fe8c054562
14 изменённых файлов: 100 добавлений и 111 удалений

Просмотреть файл

@ -59,7 +59,7 @@ job-template:
win64.*: win64-opt
run-on-projects:
by-build-platform:
linux-shippable.*: ['try', 'release'] # Do not run on autoland - Bug 1599197
linux-shippable.*: ['release'] # Do not run on autoland - Bug 1599197
default: ['all']
worker-type:
by-build-platform:

Просмотреть файл

@ -33,11 +33,11 @@ job-defaults:
sm:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try', 'integration']
default: ['mozilla-central', 'integration']
default:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
fetches:
build:
- target.jsshell.zip

Просмотреть файл

@ -32,7 +32,7 @@ job-defaults:
by-test-platform:
.*-devedition/.*: [] # don't run on devedition
(linux|win|mac)(?!.*shippable).*/opt: []
default: ['try', 'integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
fission-run-on-projects:
by-test-platform:
linux1804-64-shippable-qr/opt: ['mozilla-central']
@ -53,7 +53,7 @@ awsy-tp6:
.*-ccov/.*: [] # don't run on coverage
.*-devedition/.*: [] # don't run on devedition
(linux|win|mac)(?!.*shippable)(?!.*ccov).*/opt: []
default: ['try', 'integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
default: ['integration', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
mozharness:
extra-options:
- --tp6
@ -61,10 +61,7 @@ awsy-tp6:
awsy-dmd:
description: "Are we slim yet - dmd enabled"
treeherder-symbol: SY(sy-d)
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['try']
run-on-projects: []
mozharness:
extra-options:
- --dmd
@ -79,10 +76,7 @@ awsy-base:
awsy-base-dmd:
description: "Are we slim yet - about:blank base case - dmd enabled"
treeherder-symbol: SY(ab-d)
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['try']
run-on-projects: []
mozharness:
extra-options:
- --base

Просмотреть файл

@ -12,7 +12,7 @@ job-defaults:
workdir: /home/cltbld
run-on-projects:
by-test-platform:
linux.*shippable[^-qr].*: ['mozilla-central', 'try']
linux.*shippable[^-qr].*: ['mozilla-central']
default: []
tier: 3
fission-tier: 3
@ -57,7 +57,7 @@ browsertime-tp6:
chrome: []
default:
by-test-platform:
linux.*shippable[^-qr].*: ['mozilla-central', 'try']
linux.*shippable[^-qr].*: ['mozilla-central']
default: []
limit-platforms:
by-app:

Просмотреть файл

@ -11,8 +11,8 @@ job-defaults:
refbrow: []
default:
by-test-platform:
android-hw-p2-.*aarch64.*/pgo: ["mozilla-central", "try"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central", "try"]
android-hw-p2-.*aarch64.*/pgo: ["mozilla-central"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"]
default: []
tier: 3
target:
@ -143,7 +143,7 @@ browsertime-tp6m:
default: ['mozilla-central']
default:
by-test-platform:
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central", "try"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"]
default: []
youtube:
by-app:
@ -167,8 +167,8 @@ browsertime-tp6m:
default: ['mozilla-central']
default:
by-test-platform:
android-hw-p2-.*aarch64.*/pgo: ["mozilla-central", "try"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central", "try"]
android-hw-p2-.*aarch64.*/pgo: ["mozilla-central"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"]
default: []
default:
by-pageload:
@ -284,8 +284,8 @@ browsertime-speedometer-mobile:
fenix: []
default:
by-test-platform:
android-hw-p2-.*aarch64.*/pgo: ["mozilla-central", "try"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central", "try"]
android-hw-p2-.*aarch64.*/pgo: ["mozilla-central"]
android-hw-p2-.*aarch64-shippable/opt: ["mozilla-central"]
default: []
treeherder-symbol: Btime(sp)
mozharness:

Просмотреть файл

@ -85,8 +85,8 @@ jittest:
# Additionally, platforms contain suffixes like "/opt" or "/debug".
(?=linux).*(?!-ccov)...../.*: [] # redundant with SM(...)
(?=windows).*(?!-ccov)...../.*: [] # redundant with SM(p)
android-hw-.*-aarch64/debug: ['try', 'mozilla-central', 'release']
android-hw-.*-api-16(?:-shippable)?/.*: ['try', 'mozilla-central', 'release']
android-hw-.*-aarch64/debug: ['mozilla-central', 'release']
android-hw-.*-api-16(?:-shippable)?/.*: ['mozilla-central', 'release']
default: built-projects
chunks:
by-test-platform:

Просмотреть файл

@ -50,9 +50,9 @@ test-verify:
.*-ccov/.*: []
.*-asan/.*: []
# where shippable is available, do not run on plain opt, except on try
(?:windows10-64|windows7-32|linux1804-64|macosx.*64)(?:-qr)?/opt: ['try']
(?:windows10-64|windows7-32|linux1804-64|macosx.*64)(?:-qr)?/opt: []
# do not run on mozilla-central, beta or release: usually just confirms earlier results
default: ['autoland', 'try']
default: ['autoland']
target:
by-test-platform:
android-em-7.*: geckoview-androidTest.apk
@ -122,9 +122,9 @@ test-verify-gpu:
.*-ccov/.*: []
.*-asan/.*: []
# where shippable is available, do not run on plain opt, except on try
(?:windows10-64|windows7-32|linux1804-64|macosx.*64)(?:-qr)?/opt: ['try']
(?:windows10-64|windows7-32|linux1804-64|macosx.*64)(?:-qr)?/opt: []
# do not run on mozilla-central, beta or release: usually just confirms earlier results
default: ['autoland', 'try']
default: ['autoland']
tier: 2
mozharness:
script:
@ -219,7 +219,7 @@ test-coverage-gpu:
run-on-projects:
by-test-platform:
# only run on mozilla-central and try.
.*-ccov/.*: ['mozilla-central', 'try']
.*-ccov/.*: ['mozilla-central']
default: []
tier:
by-test-platform:

Просмотреть файл

@ -25,21 +25,21 @@ job-defaults:
by-pageload:
warm:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["try", "mozilla-central"]
windows10-64-ref-hw-2017/opt: ["mozilla-central"]
(linux|windows|macos)(?!.*shippable).*: []
default: ["try", "mozilla-central"]
default: ["mozilla-central"]
cold:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["try", "mozilla-central"]
macosx.*64(?:-qr)?/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ["mozilla-central"]
macosx.*64(?:-qr)?/opt: ["mozilla-central"]
(linux|windows|macos)(?!.*shippable).*: []
default: ["try", "trunk", "mozilla-beta"]
default: ["trunk", "mozilla-beta"]
default:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["try", "mozilla-central"]
macosx.*64(?:-qr)?/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ["mozilla-central"]
macosx.*64(?:-qr)?/opt: ["mozilla-central"]
(linux|windows|macos)(?!.*shippable).*: []
default: ["try", "trunk", "mozilla-beta"]
default: ["trunk", "mozilla-beta"]
chrome: []
chromium: []
default: # tests that dont have "apps: []"
@ -47,13 +47,13 @@ job-defaults:
raptor-.*-profiling.*:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ["try", "mozilla-central"]
default: ["mozilla-central"]
default:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["try", "mozilla-central"]
macosx.*64(?:-qr)?/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ["mozilla-central"]
macosx.*64(?:-qr)?/opt: ["mozilla-central"]
(linux|windows|macos)(?!.*shippable).*: []
default: ["try", "trunk", "mozilla-beta"]
default: ["trunk", "mozilla-beta"]
limit-platforms:
by-app:
chrome:
@ -318,7 +318,7 @@ raptor-unity-webgl-firefox:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ["mozilla-central"]
tier: 3
mozharness:
extra-options:
@ -348,7 +348,7 @@ raptor-wasm-misc-cranelift-firefox:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ["mozilla-central"]
max-run-time: 1800
tier: 2
mozharness:
@ -525,7 +525,7 @@ raptor-wasm-godot-cranelift-firefox:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time:
by-test-platform:
.*-qr/.*: 2100
@ -579,9 +579,9 @@ raptor-youtube-playback-firefox:
treeherder-symbol: Rap(ytp)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time: 3000
tier: 2
mozharness:
@ -636,9 +636,9 @@ raptor-youtube-playback-av1-sfr-firefox:
treeherder-symbol: Rap(ytp-av1-sfr)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
limit-platforms:
- windows10-64-ref-hw-2017/opt
- macosx1014-64-shippable/opt
@ -658,9 +658,9 @@ raptor-youtube-playback-h264-sfr-firefox:
treeherder-symbol: Rap(ytp-h264-sfr)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time:
by-test-platform:
windows10-aarch64/opt: 3600
@ -677,9 +677,9 @@ raptor-youtube-playback-vp9-sfr-firefox:
treeherder-symbol: Rap(ytp-vp9-sfr)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time:
by-test-platform:
windows10-aarch64/opt: 3600
@ -696,9 +696,9 @@ raptor-youtube-playback-widevine-hfr-firefox:
treeherder-symbol: Rap(ytp-widevine-hfr)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time:
by-test-platform:
windows10-aarch64/opt: 3600
@ -715,9 +715,9 @@ raptor-youtube-playback-widevine-h264-sfr-firefox:
treeherder-symbol: Rap(ytp-widevine-h264-sfr)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time:
by-test-platform:
windows10-aarch64/opt: 3600
@ -734,9 +734,9 @@ raptor-youtube-playback-widevine-vp9-sfr-firefox:
treeherder-symbol: Rap(ytp-widevine-vp9-sfr)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
max-run-time:
by-test-platform:
windows10-aarch64/opt: 3600
@ -774,9 +774,9 @@ raptor-jetstream2-firefox:
treeherder-symbol: Rap(js2)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ["mozilla-central", "try"]
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ["mozilla-central", "try"]
default: ['mozilla-central']
tier: 3
max-run-time: 8000
mozharness:

Просмотреть файл

@ -14,8 +14,8 @@ job-defaults:
fission-tier: 2
run-on-projects:
by-test-platform:
android-hw-.*-qr/debug: ['try', 'mozilla-central']
android-hw-.*-qr/opt: ['try', 'mozilla-central', 'autoland']
android-hw-.*-qr/debug: ['mozilla-central']
android-hw-.*-qr/opt: ['mozilla-central', 'autoland']
windows10-aarch64/.*: [] # Specific repos enabled below
default: built-projects
mozharness:
@ -51,7 +51,7 @@ crashtest:
e10s: true
run-on-projects:
by-test-platform:
windows10-aarch64/.*: ['try', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
windows10-aarch64/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
default: built-projects
max-run-time: 3600
tier:
@ -107,8 +107,8 @@ jsreftest:
tier: default
run-on-projects:
by-test-platform:
android-hw-.*-aarch64(?:-shippable)?/.*: ['try', 'mozilla-central', 'release']
android-hw-.*-api-16(?:-shippable)?/.*: ['try', 'mozilla-central', 'release']
android-hw-.*-aarch64(?:-shippable)?/.*: ['mozilla-central', 'release']
android-hw-.*-api-16(?:-shippable)?/.*: ['mozilla-central', 'release']
default: built-projects
reftest:
@ -131,7 +131,7 @@ reftest:
e10s: true
run-on-projects:
by-test-platform:
windows10-aarch64/.*: ['try', 'mozilla-central', 'mozilla-beta', 'mozilla-release']
windows10-aarch64/.*: ['mozilla-central', 'mozilla-beta', 'mozilla-release']
default: built-projects
max-run-time:
by-test-platform:

Просмотреть файл

@ -37,11 +37,11 @@ job-defaults:
talos-.*-profiling:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
default:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-beta', 'trunk', 'try']
default: ['mozilla-beta', 'trunk']
fission-run-on-projects:
by-test-platform:
linux64-shippable-qr/opt: ['mozilla-central']
@ -56,7 +56,7 @@ talos-bcv:
by-test-platform:
.*(?:shippable-qr|-qr)/.*: []
(linux|windows|macos)(?!.*shippable)(?!.*-qr).*: []
default: ['mozilla-beta', 'trunk', 'try']
default: ['mozilla-beta', 'trunk']
tier:
by-test-platform:
.*-qr/.*: 3 # this should be disabled but might run via try syntax anyway, so explicitly downgrade to tier-3
@ -75,7 +75,7 @@ talos-bcv-profiling:
by-test-platform:
.*(?:shippable-qr|-qr)/.*: []
(linux|windows|macos)(?!.*shippable)(?!.*-qr).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
max-run-time: 1800
mozharness:
extra-options:
@ -109,9 +109,9 @@ talos-damp:
max-run-time: 5400
run-on-projects:
by-test-platform:
windows7-32-shippable/.*: ['try']
windows7-32-shippable/.*: []
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-beta', 'trunk', 'try']
default: ['mozilla-beta', 'trunk']
mozharness:
extra-options:
@ -125,9 +125,9 @@ talos-damp-profiling:
max-run-time: 5400
run-on-projects:
by-test-platform:
windows7-32-shippable/.*: ['try']
windows7-32-shippable/.*: []
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
mozharness:
extra-options:
- --suite=damp
@ -161,7 +161,7 @@ talos-flex:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
max-run-time: 1800
mozharness:
extra-options:
@ -175,7 +175,7 @@ talos-flex-profiling:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
max-run-time: 1800
mozharness:
extra-options:
@ -234,9 +234,9 @@ talos-g4:
treeherder-symbol: T(g4)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ['try', 'mozilla-central']
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-beta', 'trunk', 'try']
default: ['mozilla-beta', 'trunk']
max-run-time:
by-test-platform:
linux64.*: 1500
@ -317,7 +317,7 @@ talos-motionmark:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
max-run-time: 3600
tier:
by-test-platform:
@ -335,7 +335,7 @@ talos-motionmark-profiling:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
max-run-time: 3600
tier:
by-test-platform:
@ -374,7 +374,7 @@ talos-sessionrestore-many-windows:
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-central', 'try']
default: ['mozilla-central']
max-run-time: 1500
mozharness:
extra-options:
@ -497,9 +497,9 @@ talos-webgl:
treeherder-symbol: T(webgl)
run-on-projects:
by-test-platform:
windows10-64-ref-hw-2017/opt: ['mozilla-central', 'try']
windows10-64-ref-hw-2017/opt: ['mozilla-central']
(linux|windows|macos)(?!.*shippable).*: []
default: ['mozilla-beta', 'trunk', 'try']
default: ['mozilla-beta', 'trunk']
max-run-time: 1800
mozharness:
extra-options:
@ -510,10 +510,7 @@ talos-webgl-profiling:
try-name: webgl
treeherder-symbol: T-Prof(webgl)
tier: 2
run-on-projects:
by-test-platform:
(linux|windows|macos)(?!.*shippable).*: []
default: ['try']
run-on-projects: []
max-run-time: 1800
mozharness:
extra-options:
@ -532,8 +529,8 @@ talos-xperf:
windows10-64.*: true
run-on-projects:
by-test-platform:
windows7-32-shippable(?:-qr)?/.*: ['mozilla-beta', 'trunk', 'try']
windows10-64-shippable(?:-qr)?/.*: ['mozilla-beta', 'trunk', 'try']
windows7-32-shippable(?:-qr)?/.*: ['mozilla-beta', 'trunk']
windows10-64-shippable(?:-qr)?/.*: ['mozilla-beta', 'trunk']
default: []
tier:
by-test-platform:

Просмотреть файл

@ -67,8 +67,8 @@ web-platform-tests:
e10s: true
run-on-projects:
by-test-platform:
linux1804-32-shippable/opt: ['try', 'release'] # skip integration, Bug 1599197
.*-qr/.*: ['release', 'try'] # skip on integration branches due to high load
linux1804-32-shippable/opt: ['release'] # skip integration, Bug 1599197
.*-qr/.*: ['release'] # skip on integration branches due to high load
default: built-projects
tier:
by-test-platform:
@ -181,7 +181,7 @@ web-platform-tests-wdspec:
- --setpref=toolkit.asyncshutdown.log=true
run-on-projects:
by-test-platform:
.*-qr/.*: ['release', 'try']
.*-qr/.*: ['release']
default: built-projects
tier:
by-test-platform:
@ -276,7 +276,7 @@ web-platform-tests-crashtest:
- --test-type=crashtest
run-on-projects:
by-test-platform:
.*-qr/.*: ['release', 'try']
.*-qr/.*: ['release']
default: built-projects
tier:
by-test-platform:
@ -299,9 +299,9 @@ test-verify-wpt:
.*-ccov/.*: []
.*-asan/.*: []
# where shippable is available, do not run on plain opt, except on try
(?:windows10-64|windows7-32|linux1804-64|macosx.*64)(?:-qr)?/opt: ['try']
(?:windows10-64|windows7-32|linux1804-64|macosx.*64)(?:-qr)?/opt: []
# do not run on beta or release: usually just confirms earlier results
default: ['autoland', 'try']
default: ['autoland']
tier: 2
mozharness:
extra-options:

Просмотреть файл

@ -54,10 +54,10 @@ class Attrmatch(unittest.TestCase):
class MatchRunOnProjects(unittest.TestCase):
def test_empty(self):
self.assertFalse(match_run_on_projects('try', []))
self.assertFalse(match_run_on_projects('birch', []))
def test_all(self):
self.assertTrue(match_run_on_projects('try', ['all']))
self.assertTrue(match_run_on_projects('birch', ['all']))
self.assertTrue(match_run_on_projects('larch', ['all']))
self.assertTrue(match_run_on_projects('autoland', ['all']))
self.assertTrue(match_run_on_projects('mozilla-central', ['all']))
@ -65,7 +65,7 @@ class MatchRunOnProjects(unittest.TestCase):
self.assertTrue(match_run_on_projects('mozilla-release', ['all']))
def test_release(self):
self.assertFalse(match_run_on_projects('try', ['release']))
self.assertFalse(match_run_on_projects('birch', ['release']))
self.assertFalse(match_run_on_projects('larch', ['release']))
self.assertFalse(match_run_on_projects('autoland', ['release']))
self.assertTrue(match_run_on_projects('mozilla-central', ['release']))
@ -73,7 +73,7 @@ class MatchRunOnProjects(unittest.TestCase):
self.assertTrue(match_run_on_projects('mozilla-release', ['release']))
def test_integration(self):
self.assertFalse(match_run_on_projects('try', ['integration']))
self.assertFalse(match_run_on_projects('birch', ['integration']))
self.assertFalse(match_run_on_projects('larch', ['integration']))
self.assertTrue(match_run_on_projects('autoland', ['integration']))
self.assertFalse(match_run_on_projects('mozilla-central', ['integration']))
@ -81,13 +81,14 @@ class MatchRunOnProjects(unittest.TestCase):
self.assertFalse(match_run_on_projects('mozilla-integration', ['integration']))
def test_combo(self):
self.assertTrue(match_run_on_projects('try', ['release', 'try', 'maple']))
self.assertFalse(match_run_on_projects('larch', ['release', 'try', 'maple']))
self.assertTrue(match_run_on_projects('maple', ['release', 'try', 'maple']))
self.assertFalse(match_run_on_projects('autoland', ['release', 'try', 'maple']))
self.assertTrue(match_run_on_projects('mozilla-central', ['release', 'try', 'maple']))
self.assertTrue(match_run_on_projects('mozilla-beta', ['release', 'try', 'maple']))
self.assertTrue(match_run_on_projects('mozilla-release', ['release', 'try', 'maple']))
self.assertTrue(match_run_on_projects('birch', ['release', 'birch', 'maple']))
self.assertFalse(match_run_on_projects('larch', ['release', 'birch', 'maple']))
self.assertTrue(match_run_on_projects('maple', ['release', 'birch', 'maple']))
self.assertFalse(match_run_on_projects('autoland', ['release', 'birch', 'maple']))
self.assertTrue(match_run_on_projects('mozilla-central', ['release', 'birch', 'maple']))
self.assertTrue(match_run_on_projects('mozilla-beta', ['release', 'birch', 'maple']))
self.assertTrue(match_run_on_projects('mozilla-release', ['release', 'birch', 'maple']))
self.assertTrue(match_run_on_projects('birch', ['birch', 'trunk']))
if __name__ == '__main__':

Просмотреть файл

@ -1211,11 +1211,11 @@ def enable_code_coverage(config, tasks):
# Temporarily disable Mac tests on mozilla-central
if 'mac' in task['build-platform']:
task['run-on-projects'] = ['try']
task['run-on-projects'] = []
# Ensure we always run on the projects defined by the build, unless the test
# is try only or shouldn't run at all.
if task['run-on-projects'] not in [[], ['try']]:
if task['run-on-projects'] not in [[]]:
task['run-on-projects'] = 'built-projects'
# Ensure we don't optimize test suites out.

Просмотреть файл

@ -76,9 +76,6 @@ def fill_template(config, tasks):
# XXX Better to run this on promote phase instead?
task['run-on-projects'] = dep.attributes.get('run_on_projects')
task['optimization'] = dep.optimization
else:
# For other builds, these can be requested to upload to the try symbol sever.
task['run-on-projects'] = ['try']
# clear out the stuff that's not part of a task description
del task['primary-dependency']