Bug 1712329: Use correct build signing tasks for msix test dependencies r=ahal

I ended up making what I think is an overall improvement to build-signing: moving it out to test-platforms.yml. This was more or less necessary due to the need to key it on variant. (It would've been possible to keep in the loader, but it would've been much uglier...)

As far as I can tell, all current jobs are keeping their current dependencies correctly from a run of `./mach taskgraph target-graph -p project=mozilla-central -J --diff`

Differential Revision: https://phabricator.services.mozilla.com/D164082
This commit is contained in:
Ben Hearsum 2022-12-12 14:36:40 +00:00
Родитель 7168a4ed55
Коммит d4ac00c2a2
5 изменённых файлов: 17 добавлений и 22 удалений

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

@ -7,6 +7,7 @@ loader: gecko_taskgraph.loader.test:loader
kind-dependencies: kind-dependencies:
- build - build
- build-signing - build-signing
- repackage-signing-shippable-l10n-msix
- repackage - repackage
- fetch - fetch
- toolchain - toolchain

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

@ -112,16 +112,19 @@ linux1804-64-clang-trunk-qr/opt:
# win32 # win32
windows7-32-qr/opt: windows7-32-qr/opt:
build-platform: win32/opt build-platform: win32/opt
build-signing-label: build-signing-win32/opt
test-sets: test-sets:
- windows-7-tests - windows-7-tests
windows7-32-shippable-qr/opt: windows7-32-shippable-qr/opt:
build-platform: win32-shippable/opt build-platform: win32-shippable/opt
build-signing-label: build-signing-win32-shippable/opt
test-sets: test-sets:
- windows-7-tests - windows-7-tests
windows10-32-shippable-qr/opt: windows10-32-shippable-qr/opt:
build-platform: win32-shippable/opt build-platform: win32-shippable/opt
build-signing-label: build-signing-win32-shippable/opt
test-sets: test-sets:
- browsertime - browsertime
- windows-talos - windows-talos
@ -151,6 +154,7 @@ windows10-32-2004-qr/opt:
windows10-32-2004-qr/debug: windows10-32-2004-qr/debug:
build-platform: win32/debug build-platform: win32/debug
build-signing-label: build-signing-win32/debug
test-sets: test-sets:
- web-platform-tests - web-platform-tests
- windows-7-tests - windows-7-tests
@ -192,6 +196,7 @@ windows10-64-shippable-qr/opt:
# win10-64 2004 # win10-64 2004
windows10-64-2004-ccov-qr/opt: windows10-64-2004-ccov-qr/opt:
build-platform: win64-ccov/opt build-platform: win64-ccov/opt
build-signing-label: build-signing-win64-ccov/opt
test-sets: test-sets:
- desktop-screenshot-capture - desktop-screenshot-capture
- ccov-code-coverage-tests - ccov-code-coverage-tests
@ -200,12 +205,14 @@ windows10-64-2004-ccov-qr/opt:
windows10-64-2004-qr/debug: windows10-64-2004-qr/debug:
build-platform: win64/debug build-platform: win64/debug
build-signing-label: build-signing-win64/debug
test-sets: test-sets:
- web-platform-tests - web-platform-tests
- windows10-2004-tests - windows10-2004-tests
windows10-64-2004-qr/opt: windows10-64-2004-qr/opt:
build-platform: win64/opt build-platform: win64/opt
build-signing-label: build-signing-win64/opt
test-sets: test-sets:
- awsy - awsy
- desktop-screenshot-capture - desktop-screenshot-capture
@ -216,6 +223,10 @@ windows10-64-2004-qr/opt:
windows10-64-2004-shippable-qr/opt: windows10-64-2004-shippable-qr/opt:
build-platform: win64-shippable/opt build-platform: win64-shippable/opt
build-signing-label:
by-variant:
msix: repackage-signing-shippable-l10n-msix-win64-shippable/opt
default: build-signing-win64-shippable/opt
test-sets: test-sets:
- awsy - awsy
- desktop-screenshot-capture - desktop-screenshot-capture
@ -226,6 +237,7 @@ windows10-64-2004-shippable-qr/opt:
windows10-64-2004-devedition-qr/opt: windows10-64-2004-devedition-qr/opt:
build-platform: win64-devedition/opt build-platform: win64-devedition/opt
build-signing-label: build-signing-win64-devedition/opt
test-sets: test-sets:
- desktop-screenshot-capture - desktop-screenshot-capture
- web-platform-tests - web-platform-tests
@ -251,11 +263,13 @@ windows10-64-2004-mingwclang-qr/opt:
macosx1100-64-qr/debug: macosx1100-64-qr/debug:
build-platform: macosx64/debug build-platform: macosx64/debug
build-signing-label: repackage-macosx64/debug
test-sets: test-sets:
- macosx1100-64-jittests - macosx1100-64-jittests
macosx1100-64-shippable-qr/opt: macosx1100-64-shippable-qr/opt:
build-platform: macosx64-shippable/opt build-platform: macosx64-shippable/opt
build-signing-label: repackage-macosx64-shippable/opt
test-sets: test-sets:
- macosx1100-64-jittests - macosx1100-64-jittests
- macosx1100-64-qr-tests - macosx1100-64-qr-tests

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

@ -116,27 +116,6 @@ def get_test_platforms(
test_platforms[test_platform].update(cfg) test_platforms[test_platform].update(cfg)
if build_platform in signed_builds_by_platform:
# Context: Signed builds are only used by Windows and macOS 11.0
if test_platform.startswith("macosx1100"):
if "shippable" in test_platform:
test_platforms[test_platform][
"build-signing-label"
] = "repackage-macosx64-shippable/opt"
else:
if "debug" in test_platform:
test_platforms[test_platform][
"build-signing-label"
] = "repackage-macosx64/debug"
else:
test_platforms[test_platform][
"build-signing-label"
] = "repackage-macosx64/opt"
else:
test_platforms[test_platform][
"build-signing-label"
] = signed_builds_by_platform[build_platform].label
return test_platforms return test_platforms

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

@ -212,7 +212,7 @@ test_description_schema = Schema(
Required("build-label"): str, Required("build-label"): str,
# the label of the signing task generating the materials to test. # the label of the signing task generating the materials to test.
# Signed builds are used in xpcshell tests on Windows, for instance. # Signed builds are used in xpcshell tests on Windows, for instance.
Optional("build-signing-label"): str, Optional("build-signing-label"): optionally_keyed_by("variant", str),
# the build's attributes # the build's attributes
Required("build-attributes"): {str: object}, Required("build-attributes"): {str: object},
# the platform on which the tests will run # the platform on which the tests will run

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

@ -231,6 +231,7 @@ def handle_keyed_by(config, tasks):
"target", "target",
"webrender-run-on-projects", "webrender-run-on-projects",
"mozharness.requires-signed-builds", "mozharness.requires-signed-builds",
"build-signing-label",
] ]
for task in tasks: for task in tasks:
for field in fields: for field in fields: