diff --git a/taskcluster/ci/signing/kind.yml b/taskcluster/ci/signing/kind.yml index 9a11e69b2..b1219bbca 100644 --- a/taskcluster/ci/signing/kind.yml +++ b/taskcluster/ci/signing/kind.yml @@ -54,6 +54,12 @@ job-template: '3': production-signing default: dep-signing default: dep-signing + signing-format: + by-build-type: + # Fennec nightly cannot have the sha256 checksums. For more details, see + # https://github.com/mozilla-releng/scriptworker-scripts/pull/102#issue-349016967 + fennec-nightly: autograph_apk_fennec_sha1 + default: autograph_apk index: by-build-type: (fennec-.+|nightly|performance-test|beta|production): diff --git a/taskcluster/fenix_taskgraph/transforms/signing.py b/taskcluster/fenix_taskgraph/transforms/signing.py index 82ece300c..e0c6fb61d 100644 --- a/taskcluster/fenix_taskgraph/transforms/signing.py +++ b/taskcluster/fenix_taskgraph/transforms/signing.py @@ -18,7 +18,7 @@ transforms = TransformSequence() @transforms.add def resolve_keys(config, tasks): for task in tasks: - for key in ("index", "worker-type", "worker.signing-type"): + for key in ("index", "worker-type", "worker.signing-type", "signing-format"): resolve_keyed_by( task, key, @@ -41,6 +41,7 @@ def set_signing_attributes(config, tasks): @transforms.add def set_signing_format(config, tasks): for task in tasks: + signing_format = task.pop("signing-format") for upstream_artifact in task["worker"]["upstream-artifacts"]: - upstream_artifact["formats"] = ["autograph_apk"] + upstream_artifact["formats"] = [signing_format] yield task