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

taskcluster/ci/test/kind.yml

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

taskcluster/ci/test/test-platforms.yml

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

taskcluster/gecko_taskgraph/loader/test.py

@@ -116,27 +116,6 @@ def get_test_platforms(
 
         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
 
 

taskcluster/gecko_taskgraph/transforms/test/__init__.py

@@ -212,7 +212,7 @@ test_description_schema = Schema(
         Required("build-label"): str,
         # the label of the signing task generating the materials to test.
         # 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
         Required("build-attributes"): {str: object},
         # the platform on which the tests will run

taskcluster/gecko_taskgraph/transforms/test/other.py

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