Bug 1586748 - Re-enable build-signing for N and Ngv tasks and clean up unused fennec manifests/kinds r=nalexander draft
authorJohan Lorenzo <jlorenzo@mozilla.com>
Thu, 10 Oct 2019 12:57:47 +0000
changeset 2375322 56309ae7ecbf5e1123472742f3b5095c614df594
parent 2373348 0c108c06ee6e3173a22578d00bc0f02ab0fb9e31
child 2375323 6a348c81d2d791128f91da0a0f6aedaf61c13b17
push id433694
push userreviewbot
push dateThu, 10 Oct 2019 12:58:03 +0000
treeherdertry@6a348c81d2d7 [default view] [failures only]
reviewersnalexander
bugs1586748
milestone71.0a1
Bug 1586748 - Re-enable build-signing for N and Ngv tasks and clean up unused fennec manifests/kinds r=nalexander Differential Revision: https://phabricator.services.mozilla.com/D48831 Differential Diff: PHID-DIFF-zj65ch7ubk72rvpb7npk
taskcluster/ci/balrog/kind.yml
taskcluster/ci/beetmover-checksums/kind.yml
taskcluster/ci/beetmover-l10n/kind.yml
taskcluster/ci/beetmover/kind.yml
taskcluster/ci/build-signing/kind.yml
taskcluster/ci/build/android.yml
taskcluster/ci/post-beetmover-dummy/kind.yml
taskcluster/taskgraph/manifests/fennec_candidates.yml
taskcluster/taskgraph/manifests/fennec_candidates_checksums.yml
taskcluster/taskgraph/manifests/fennec_nightly.yml
taskcluster/taskgraph/manifests/fennec_nightly_checksums.yml
taskcluster/taskgraph/transforms/beetmover_l10n.py
taskcluster/taskgraph/transforms/build_signing.py
taskcluster/taskgraph/util/signed_artifacts.py
--- a/taskcluster/ci/balrog/kind.yml
+++ b/taskcluster/ci/balrog/kind.yml
@@ -6,18 +6,16 @@ loader: taskgraph.loader.single_dep:load
 
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.balrog_submit:transforms
     - taskgraph.transforms.scriptworker:add_balrog_scopes
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
-    - beetmover
-    - beetmover-l10n
     - beetmover-repackage
 
 only-for-attributes:
     - nightly
     - shippable
 
 not-for-build-platforms:
     - android-api-16-nightly/opt
--- a/taskcluster/ci/beetmover-checksums/kind.yml
+++ b/taskcluster/ci/beetmover-checksums/kind.yml
@@ -5,29 +5,22 @@
 loader: taskgraph.loader.single_dep:loader
 
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.beetmover_checksums:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
-    - beetmover
     - beetmover-repackage
 
 only-for-attributes:
     - nightly
     - shippable
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_prefix: public
         artifact_map:
             by-release-type:
-                beta|release.*|esr.*:
-                    by-platform:
-                        android.*: taskcluster/taskgraph/manifests/fennec_candidates_checksums.yml
-                        default: taskcluster/taskgraph/manifests/firefox_candidates_checksums.yml
-                default:
-                    by-platform:
-                        android.*: taskcluster/taskgraph/manifests/fennec_nightly_checksums.yml
-                        default: taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
+                beta|release.*|esr.*: taskcluster/taskgraph/manifests/firefox_candidates_checksums.yml
+                default: taskcluster/taskgraph/manifests/firefox_nightly_checksums.yml
deleted file mode 100644
--- a/taskcluster/ci/beetmover-l10n/kind.yml
+++ /dev/null
@@ -1,42 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-loader: taskgraph.loader.single_dep:loader
-
-transforms:
-    - taskgraph.transforms.beetmover_l10n:transforms
-    - taskgraph.transforms.name_sanity:transforms
-    - taskgraph.transforms.beetmover:transforms
-    - taskgraph.transforms.task:transforms
-
-kind-dependencies:
-    - nightly-l10n-signing
-
-only-for-attributes:
-    - nightly
-
-not-for-build-platforms:
-    - linux-shippable/opt
-    - linux64-shippable/opt
-    - macosx64-shippable/opt
-    - win32-shippable/opt
-    - win64-shippable/opt
-    - win64-aarch64-shippable/opt
-    - linux-nightly/opt
-    - linux64-nightly/opt
-    - macosx64-nightly/opt
-    - win32-nightly/opt
-    - win64-nightly/opt
-    - win64-aarch64-nightly/opt
-    - linux-devedition-nightly/opt
-    - linux64-devedition-nightly/opt
-    - macosx64-devedition-nightly/opt
-    - win32-devedition-nightly/opt
-    - win64-devedition-nightly/opt
-    - win64-aarch64-devedition-nightly/opt
-
-job-template:
-    shipping-phase: promote
-    attributes:
-        artifact_map: taskcluster/taskgraph/manifests/fennec_nightly.yml
deleted file mode 100644
--- a/taskcluster/ci/beetmover/kind.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-loader: taskgraph.loader.single_dep:loader
-
-transforms:
-    - taskgraph.transforms.name_sanity:transforms
-    - taskgraph.transforms.beetmover:transforms
-    - taskgraph.transforms.task:transforms
-
-kind-dependencies:
-    - build-signing
-
-only-for-attributes:
-    - nightly
-
-not-for-build-platforms:
-    - linux-nightly/opt
-    - linux-shippable/opt
-    - linux64-nightly/opt
-    - linux64-shippable/opt
-    - macosx64-nightly/opt
-    - macosx64-shippable/opt
-    - win32-nightly/opt
-    - win32-shippable/opt
-    - win64-nightly/opt
-    - win64-shippable/opt
-    - win64-aarch64-nightly/opt
-    - win64-aarch64-shippable/opt
-    - linux-devedition-nightly/opt
-    - linux64-devedition-nightly/opt
-    - macosx64-devedition-nightly/opt
-    - win32-devedition-nightly/opt
-    - win64-devedition-nightly/opt
-    - win64-aarch64-devedition-nightly/opt
-    - linux64-asan-reporter-nightly/opt
-    - win64-asan-reporter-nightly/opt
-    - android-geckoview-fat-aar-nightly/opt
-
-job-template:
-    shipping-phase: promote
-    attributes:
-        artifact_map:
-            by-release-type:
-                beta|release.*|esr.*: taskcluster/taskgraph/manifests/fennec_candidates.yml
-                default: taskcluster/taskgraph/manifests/fennec_nightly.yml
--- a/taskcluster/ci/build-signing/kind.yml
+++ b/taskcluster/ci/build-signing/kind.yml
@@ -7,8 +7,9 @@ loader: taskgraph.loader.build_signing:l
 transforms:
     - taskgraph.transforms.name_sanity:transforms
     - taskgraph.transforms.build_signing:transforms
     - taskgraph.transforms.signing:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - build
+    - build-fat-aar
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -104,17 +104,16 @@ android-x86-fuzzing/debug:
         toolchain:
             - linux64-sccache
 
 android-x86-nightly/opt:
     description: "Android 4.2 x86 Nightly"
     attributes:
         enable-full-crashsymbols: true
         nightly: true
-        disable-build-signing: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-x86-opt
         type: android-nightly
     treeherder:
         platform: android-4-2-x86/opt
         symbol: N
@@ -170,17 +169,16 @@ android-api-16/pgo:
         custom-build-variant-cfg: api-16
 
 android-api-16-nightly/opt:
     description: "Android 4.0 api-16+ Nightly"
     use-pgo: android-api-16/pgo
     attributes:
         enable-full-crashsymbols: true
         nightly: true
-        disable-build-signing: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-api-16-opt
         type: android-nightly-with-multi-l10n
     treeherder:
         platform: android-4-0-armv7-api16/opt
         symbol: N
@@ -257,17 +255,16 @@ android-aarch64/debug:
             - linux64-sccache
 
 android-aarch64-nightly/opt:
     description: "Android 5.0 AArch64 Nightly"
     use-pgo: android-api-16/pgo
     attributes:
         enable-full-crashsymbols: true
         nightly: true
-        disable-build-signing: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-aarch64-opt
         type: android-nightly
     treeherder:
         platform: android-5-0-aarch64/opt
         symbol: N
@@ -303,17 +300,16 @@ android-x86_64/opt:
         toolchain:
             - linux64-sccache
 
 android-x86_64-nightly/opt:
     description: "Android 5.0 x86-64 Nightly"
     attributes:
         enable-full-crashsymbols: true
         nightly: true
-        disable-build-signing: true
     shipping-phase: build
     shipping-product: fennec
     index:
         job-name: android-x86_64-opt
         type: android-nightly
     treeherder:
         platform: android-5-0-x86_64/opt
         symbol: N
--- a/taskcluster/ci/post-beetmover-dummy/kind.yml
+++ b/taskcluster/ci/post-beetmover-dummy/kind.yml
@@ -7,19 +7,16 @@ loader: taskgraph.loader.single_dep:load
 transforms:
     - taskgraph.transforms.per_platform_dummy:transforms
     - taskgraph.transforms.reverse_chunk_deps:transforms
     - taskgraph.transforms.task:transforms
 
 kind-dependencies:
     - beetmover-checksums
     - beetmover-repackage
-    # Fennec doesn't have beetmover-{checksums,repackage}, so
-    # also depend on vanilla beetmover.
-    - beetmover
 
 job-template:
     description: Dummy task to deal with max_dependencies
     run-on-projects: []
     shipping-phase: promote
     worker-type: succeed
     worker:
         implementation: succeed
deleted file mode 100644
--- a/taskcluster/taskgraph/manifests/fennec_candidates.yml
+++ /dev/null
@@ -1,153 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-s3_bucket_paths:
-    - pub/mobile/candidates
-default_locales:  # if given an empty locale, use these locales
-    - en-US
-    - multi
-tasktype_map:  # map task reference to task type.
-    build: build
-    build-signing: signing
-    nightly-l10n-signing: signing
-platform_names:
-    path_platform:
-        by-platform:
-            android-x86-nightly: 'android-x86'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-api-16'
-            android-aarch64-nightly: 'android-aarch64'
-    filename_platform:
-        by-platform:
-            android-x86-nightly: 'android-i386'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-arm'
-            android-aarch64-nightly: 'android-aarch64'
-
-# A default entry, which the mappings below extend and override.
-# Final 'destinations' will be the product of:
-# s3_bucket_paths + destinations + locale_prefix + pretty_name
-default: &default
-    from:
-        - build
-    all_locales: false
-    description: "TO_BE_OVERRIDDEN"
-    locale_prefix: '${locale}/'
-    # anything between artifact prefix and filename within upstream task
-    source_path_modifier:
-        by-locale:
-            default: '${locale}'
-            multi: ''
-    destinations:
-        - ${version}-candidates/build${build_number}/${path_platform}
-
-# configuration for individual files. Extends 'default', above.
-mapping:
-    buildhub.json:
-        <<: *default
-        all_locales: true
-        description: "Build related information to be consumed by Buildhub service"
-        pretty_name: buildhub.json
-        checksums_path: ${path_platform}/${locale}/buildhub.json
-    target.common.tests.tar.gz:
-        <<: *default
-        description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.common.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.common.tests.tar.gz
-    target.cppunittest.tests.tar.gz:
-        <<: *default
-        description: "C++ unittests related in-tree test infrastructure"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz
-    target.crashreporter-symbols.zip:
-        <<: *default
-        description: "Crashreporter symbols to be consumed by Socorro"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.crashreporter-symbols.zip
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.crashreporter-symbols.zip
-    target.json:
-        <<: *default
-        all_locales: true
-        description: "Various compile and moz_app flags baked together in a json file"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.json
-    target.mochitest.tests.tar.gz:
-        <<: *default
-        description: "Results for running the mochitest testing framework via Javascript function calls"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz
-    target.mozinfo.json:
-        <<: *default
-        all_locales: true
-        description: "Various compile and moz_app flags baked together in a json file"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.mozinfo.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.mozinfo.json
-    target.reftest.tests.tar.gz:
-        <<: *default
-        description: "Results for running the reftest testing framework via display of two Web pages comparison"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz
-    target.talos.tests.tar.gz:
-        <<: *default
-        description: "Results for running the talos testing framework to measure performance"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.talos.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.talos.tests.tar.gz
-    target.awsy.tests.tar.gz:
-        <<: *default
-        description: "Results for running the awsy testing framework to track memory usage"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz
-    target.test_packages.json:
-        <<: *default
-        description: "File containing metadata about all other files and testing harnesses specifics"
-        all_locales: true
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.test_packages.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.test_packages.json
-    target.web-platform.tests.tar.gz:
-        <<: *default
-        description: "Results for running the webplatform testing framework to cover standard Web platform features"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz
-    target.xpcshell.tests.tar.gz:
-        <<: *default
-        description: "Results for running the xpcshell testing framework to enable XPConnect console application"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz
-    target_info.txt:
-        <<: *default
-        all_locales: true
-        locale_prefix: ''
-        description: "File containing the buildID"
-        pretty_name: ${path_platform}_info.txt
-        checksums_path: ${path_platform}_info.txt
-        destinations:
-            - ${version}-candidates/build${build_number}
-    mozharness.zip:
-        <<: *default
-        description: "File containing the mozharness set of scripts and configuration used by various automation tools"
-        pretty_name: mozharness.zip
-        checksums_path: mozharness.zip
-    robocop.apk:
-        <<: *default
-        description: "APK to enable the Robocop testing framework "
-        all_locales: true
-        pretty_name: robocop.apk
-        checksums_path: robocop.apk
-    target.jsshell.zip:
-        <<: *default
-        description: "Set of shells to allow test snippets of Javascript code without needing to reload the page"
-        pretty_name: jsshell-${filename_platform}.zip
-        checksums_path: jsshell-${filename_platform}.zip
-    target.apk:
-        <<: *default
-        description: "The main installer we ship our mobile products baked within"
-        all_locales: true
-        from:
-            - build-signing
-            - nightly-l10n-signing
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.apk
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.apk
-        update_balrog_manifest:
-            by-locale:
-                multi: true
-                default: false
deleted file mode 100644
--- a/taskcluster/taskgraph/manifests/fennec_candidates_checksums.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-s3_bucket_paths:
-    - pub/mobile/candidates
-default_locales:  # if given an empty locale, use these locales
-    - en-US
-tasktype_map:  # Map task reference to task type.
-    beetmover: beetmover
-
-platform_names:
-    path_platform:
-        by-platform:
-            android-x86-nightly: 'android-x86'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-api-16'
-            android-aarch64-nightly: 'android-aarch64'
-    filename_platform:
-        by-platform:
-            android-x86-nightly: 'android-i386'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-arm'
-            android-aarch64-nightly: 'android-aarch64'
-
-# A default entry, which the mappings below extend and override.
-# Final 'destinations' will be the product of:
-# s3_bucket_paths + destinations + locale_prefix + pretty_name
-default: &default
-    from:
-        - beetmover
-    all_locales: true
-    description: "TO_BE_OVERRIDDEN"
-    locale_prefix:
-        by-locale:
-            default: ''
-            en-US: '${locale}/'
-    source_path_modifier: ''
-    destinations:
-        - ${version}-candidates/build${build_number}/beetmover-checksums/${path_platform}
-
-# Configuration for individual files. Extends 'default', above.
-mapping:
-    target.checksums:
-        <<: *default
-        description: "Checksums file containing size, hash, sha algorithm and filename"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.checksums.beet
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.checksums
deleted file mode 100644
--- a/taskcluster/taskgraph/manifests/fennec_nightly.yml
+++ /dev/null
@@ -1,168 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-s3_bucket_paths:
-    - pub/mobile/nightly
-default_locales:  # if given an empty locale, use these locales
-    - en-US
-    - multi
-tasktype_map:  # Map task reference to task type.
-    build: build
-    build-signing: signing
-    nightly-l10n-signing: signing
-platform_names:
-    path_platform:
-        by-platform:
-            android-x86-nightly: 'android-x86'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-api-16'
-            android-aarch64-nightly: 'android-aarch64'
-    filename_platform:
-        by-platform:
-            android-x86-nightly: 'android-i386'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-arm'
-            android-aarch64-nightly: 'android-aarch64'
-
-# A default entry, which the mappings below extend and override.
-# Final 'destinations' will be the product of:
-# s3_bucket_paths + destinations + locale_prefix + pretty_name
-default: &default
-    from:
-        - build
-    all_locales: false
-    description: "TO_BE_OVERRIDDEN"
-    locale_prefix:
-        by-locale:
-            default: ''
-            en-US: '${locale}/'
-    source_path_modifier:  # Anything between artifact prefix and filename
-        by-locale:
-            default: '${locale}'
-            multi: ''
-    destinations:  # locale_prefix is appended
-        by-locale:
-            multi:
-                - ${year}/${month}/${upload_date}-${branch}-${path_platform}
-                - latest-${branch}-${path_platform}
-            en-US:
-                - ${year}/${month}/${upload_date}-${branch}-${path_platform}
-                - latest-${branch}-${path_platform}
-            default:
-                - ${year}/${month}/${upload_date}-${branch}-${path_platform}-l10n
-                - latest-${branch}-${path_platform}-l10n
-
-# Configuration for individual files. Extends 'default', above.
-mapping:
-    buildhub.json:
-        <<: *default
-        all_locales: true
-        description: "Build related information to be consumed by Buildhub service"
-        locale_prefix: ''
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.buildhub.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.buildhub.json
-    target.common.tests.tar.gz:
-        <<: *default
-        description: "Mixture of reftests, mochitests, UI and others, commonly bundled together in a test suite"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.common.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.common.tests.tar.gz
-    target.cppunittest.tests.tar.gz:
-        <<: *default
-        description: "C++ unittests related in-tree test infrastructure"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.cppunittest.tests.tar.gz
-    target.crashreporter-symbols.zip:
-        <<: *default
-        description: "Crashreporter symbols to be consumed by Socorro"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.crashreporter-symbols.zip
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.crashreporter-symbols.zip
-    target.json:
-        <<: *default
-        all_locales: true
-        description: "Various compile and moz_app flags baked together in a json file"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.json
-    target.mochitest.tests.tar.gz:
-        <<: *default
-        description: "Results for running the mochitest testing framework via Javascript function calls"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.mochitest.tests.tar.gz
-    target.mozinfo.json:
-        <<: *default
-        all_locales: true
-        description: "Various compile and moz_app flags baked together in a json file"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.mozinfo.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.mozinfo.json
-    target.reftest.tests.tar.gz:
-        <<: *default
-        description: "Results for running the reftest testing framework via display of two Web pages comparison"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.reftest.tests.tar.gz
-    target.talos.tests.tar.gz:
-        <<: *default
-        description: "Results for running the talos testing framework to measure performance"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.talos.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.talos.tests.tar.gz
-    target.awsy.tests.tar.gz:
-        <<: *default
-        description: "Results for running the awsy testing framework to track memory usage"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.awsy.tests.tar.gz
-    target.test_packages.json:
-        <<: *default
-        description: "File containing metadata about all other files and testing harnesses specifics"
-        all_locales: true
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.test_packages.json
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.test_packages.json
-    target.txt:
-        <<: *default
-        description: "File containing buildid and revision"
-        all_locales: true
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.txt
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.txt
-    target.web-platform.tests.tar.gz:
-        <<: *default
-        description: "Results for running the webplatform testing framework to cover standard Web platform features"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.web-platform.tests.tar.gz
-    target.xpcshell.tests.tar.gz:
-        <<: *default
-        description: "Results for running the xpcshell testing framework to enable XPConnect console application"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.xpcshell.tests.tar.gz
-    target_info.txt:
-        <<: *default
-        all_locales: true
-        description: "File containing the buildID"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}_info.txt
-        checksums_path: fennec-${version}.${locale}.${filename_platform}_info.txt
-    mozharness.zip:
-        <<: *default
-        description: "File containing the mozharness set of scripts and configuration used by various automation tools"
-        pretty_name: mozharness.zip
-        checksums_path: mozharness.zip
-    robocop.apk:
-        <<: *default
-        description: "APK to enable the Robocop testing framework "
-        all_locales: true
-        pretty_name: robocop.apk
-        checksums_path: robocop.apk
-    target.jsshell.zip:
-        <<: *default
-        description: "Set of shells to allow test snippets of Javascript code without needing to reload the page"
-        pretty_name: jsshell-${filename_platform}.zip
-        checksums_path: jsshell-${filename_platform}.zip
-    target.apk:
-        <<: *default
-        description: "The main installer we ship our mobile products baked within"
-        all_locales: true
-        from:
-            - build-signing
-            - nightly-l10n-signing
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.apk
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.apk
-        update_balrog_manifest:
-            by-locale:
-                multi: true
-                default: false
deleted file mode 100644
--- a/taskcluster/taskgraph/manifests/fennec_nightly_checksums.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
----
-s3_bucket_paths:
-    - pub/mobile/nightly
-default_locales:  # if given an empty locale, use these locales
-    - en-US
-tasktype_map:  # Map task reference to task type.
-    beetmover: beetmover
-platform_names:
-    path_platform:
-        by-platform:
-            android-x86-nightly: 'android-x86'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-api-16'
-            android-aarch64-nightly: 'android-aarch64'
-    filename_platform:
-        by-platform:
-            android-x86-nightly: 'android-i386'
-            android-x86_64-nightly: 'android-x86_64'
-            android-api-16-nightly: 'android-arm'
-            android-aarch64-nightly: 'android-aarch64'
-
-# A default entry, which the mappings below extend and override.
-# Final 'destinations' will be the product of:
-# s3_bucket_paths + destinations + locale_prefix + pretty_name
-default: &default
-    from:
-        - beetmover
-    all_locales: true
-    description: "TO_BE_OVERRIDDEN"
-    locale_prefix:
-        by-locale:
-            default: ''
-            en-US: '${locale}/'
-    source_path_modifier: ''
-    destinations:  # locale_prefix is appended
-        by-locale:
-            multi:
-                - ${year}/${month}/${upload_date}-${branch}-${path_platform}
-                - latest-${branch}-${path_platform}
-            en-US:
-                - ${year}/${month}/${upload_date}-${branch}-${path_platform}
-                - latest-${branch}-${path_platform}
-            default:
-                - ${year}/${month}/${upload_date}-${branch}-${path_platform}-l10n
-                - latest-${branch}-${path_platform}-l10n
-
-# Configuration for individual files. Extends 'default', above.
-mapping:
-    target.checksums:
-        <<: *default
-        description: "Checksums file containing size, hash, sha algorithm and filename"
-        pretty_name: fennec-${version}.${locale}.${filename_platform}.checksums
-        checksums_path: fennec-${version}.${locale}.${filename_platform}.checksums
deleted file mode 100644
--- a/taskcluster/taskgraph/transforms/beetmover_l10n.py
+++ /dev/null
@@ -1,39 +0,0 @@
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-"""
-Transform the signing task into an actual task description.
-"""
-
-from __future__ import absolute_import, print_function, unicode_literals
-
-from taskgraph.transforms.base import TransformSequence
-from taskgraph.util.treeherder import join_symbol
-
-transforms = TransformSequence()
-
-
-@transforms.add
-def make_beetmover_description(config, jobs):
-    for job in jobs:
-        dep_job = job['primary-dependency']
-        for locale in dep_job.attributes.get('chunk_locales', []):
-
-            group = 'BM'
-
-            # add the locale code
-            symbol = locale
-
-            treeherder = {
-                'symbol': join_symbol(group, symbol),
-            }
-
-            beet_description = {
-                'primary-dependency': dep_job,
-                'treeherder': treeherder,
-                'locale': locale,
-                'shipping-phase': job['shipping-phase'],
-                'attributes': job['attributes'],
-            }
-
-            yield beet_description
--- a/taskcluster/taskgraph/transforms/build_signing.py
+++ b/taskcluster/taskgraph/transforms/build_signing.py
@@ -55,22 +55,16 @@ def define_upstream_artifacts(config, jo
 
         artifacts_specifications = generate_specifications_of_artifacts_to_sign(
             config,
             job,
             keep_locale_template=False,
             kind=config.kind,
         )
 
-        if 'android' in build_platform:
-            # We're in the job that creates both multilocale and en-US APKs
-            artifacts_specifications[0]['artifacts'].append(
-                get_artifact_path(dep_job, 'en-US/target.apk')
-            )
-
         job['upstream-artifacts'] = [{
             'taskId': {'task-reference': '<build>'},
             'taskType': 'build',
             'paths': spec['artifacts'],
             'formats': spec['formats'],
         } for spec in artifacts_specifications]
 
         yield job
--- a/taskcluster/taskgraph/util/signed_artifacts.py
+++ b/taskcluster/taskgraph/util/signed_artifacts.py
@@ -32,21 +32,16 @@ def generate_specifications_of_artifacts
         artifacts_specifications = [{
             'artifacts': [
                 get_artifact_path(job, 'source.tar.xz')
             ],
             'formats': ['autograph_gpg'],
         }]
     elif 'android' in build_platform:
         artifacts_specifications = [{
-            'artifacts': [
-                get_artifact_path(job, '{locale}/target.apk'),
-            ],
-            'formats': ['autograph_apk_fennec_sha1'],
-        }, {
             'artifacts': get_geckoview_artifacts_to_sign(config, job),
             'formats': ['autograph_gpg'],
         }]
     # XXX: Mars aren't signed here (on any platform) because internals will be
     # signed at after this stage of the release
     elif 'macosx' in build_platform:
         if is_partner_kind(kind):
             extension = 'tar.gz'