Bug 1714200: Use `repackage` as dependent task for mac tests requiring signed builds. r=jmaher

Test jobs expect dmgs, which are not produced by `build-signing`

Depends on D120752

Differential Revision: https://phabricator.services.mozilla.com/D120753
This commit is contained in:
Ben Hearsum 2021-07-26 13:16:25 +00:00
Родитель bc71d211b0
Коммит a4d6f61377
4 изменённых файлов: 15 добавлений и 4 удалений

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

@ -26,6 +26,7 @@ only-for-build-platforms:
- macosx64-shippable/opt
- macosx64-devedition/opt
- macosx64/opt
- macosx64/debug
- win32-shippable/opt
- win32-devedition/opt
- win32/opt

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

@ -7,6 +7,7 @@ loader: taskgraph.loader.test:loader
kind-dependencies:
- build
- build-signing
- repackage
- fetch
- toolchain

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

@ -120,9 +120,18 @@ def get_test_platforms(
if build_platform in signed_builds_by_platform:
# Context: Signed builds are only used by Windows
test_platforms[test_platform][
"build-signing-label"
] = signed_builds_by_platform[build_platform].label
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

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

@ -16,7 +16,7 @@ transforms = TransformSequence()
def add_indexes(config, jobs):
for job in jobs:
repackage_type = job["attributes"].get("repackage_type")
if repackage_type:
if repackage_type and job["attributes"]["build_type"] != "debug":
build_platform = job["attributes"]["build_platform"]
job_name = "{}-{}".format(build_platform, repackage_type)
product = job.get("index", {}).get("product", "firefox")