From 5196fd1fa8b410e1f3e700b0ee9cd051c9a7dacf Mon Sep 17 00:00:00 2001 From: Aki Sasaki Date: Mon, 25 Nov 2019 21:49:47 +0000 Subject: [PATCH] Bug 1599223 - remove target.bz2.complete.mar r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D54613 --HG-- extra : moz-landing-system : lando --- .../release-balrog-submit-toplevel/kind.yml | 22 ------------------- .../ci/release-bouncer-sub-nazgul/kind.yml | 4 +--- taskcluster/ci/release-bouncer-sub/kind.yml | 4 +--- taskcluster/ci/repackage-l10n/kind.yml | 10 ++++----- taskcluster/ci/repackage/kind.yml | 10 ++++----- .../manifests/firefox_candidates.yml | 12 ---------- .../transforms/bouncer_submission.py | 7 ------ .../taskgraph/transforms/mar_signing.py | 1 - taskcluster/taskgraph/transforms/repackage.py | 12 ---------- 9 files changed, 12 insertions(+), 70 deletions(-) diff --git a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml index bda14864611c..0a9b2b55a37a 100644 --- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml +++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml @@ -55,28 +55,6 @@ jobs: tier: 1 kind: build - firefox-bz2: - name: submit-toplevel-firefox-release-to-balrog-bz2 - description: Submit toplevel Firefox release to balrog - shipping-product: firefox - run-on-releases: [esr60, esr68] - worker: - product: firefox - channel-names: ["esr", "esr-localtest", "esr-cdntest", "esr-localtest-next", "esr-cdntest-next"] - rules-to-update: - by-release-type: - esr68: ["esr52-cdntest-next", "esr52-localtest-next"] - esr60: ["esr52-cdntest", "esr52-localtest"] - platforms: ["linux", "linux64", "macosx64", "win32", "win64"] - blob-suffix: -bz2 - complete-mar-filename-pattern: '%s-%s.bz2.complete.mar' - complete-mar-bouncer-product-pattern: '%s-%s-complete-bz2' - treeherder: - platform: firefox-release/opt - symbol: Rel(BPFx-bz2) - tier: 1 - kind: build - devedition: name: submit-toplevel-devedition-release-to-balrog description: submit toplevel Devedition release to balrog diff --git a/taskcluster/ci/release-bouncer-sub-nazgul/kind.yml b/taskcluster/ci/release-bouncer-sub-nazgul/kind.yml index 2b82d416db19..5a8914ca801f 100644 --- a/taskcluster/ci/release-bouncer-sub-nazgul/kind.yml +++ b/taskcluster/ci/release-bouncer-sub-nazgul/kind.yml @@ -54,9 +54,7 @@ jobs: bouncer-products: by-release-type: default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer', 'msi'] - esr68: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar', 'msi'] - # No stub installer in esr60 - esr60: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar'] + esr68: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi'] shipping-product: firefox treeherder: platform: firefox-release/opt diff --git a/taskcluster/ci/release-bouncer-sub/kind.yml b/taskcluster/ci/release-bouncer-sub/kind.yml index 75509ad0ac59..0e86e18f5f2f 100644 --- a/taskcluster/ci/release-bouncer-sub/kind.yml +++ b/taskcluster/ci/release-bouncer-sub/kind.yml @@ -54,9 +54,7 @@ jobs: bouncer-products: by-release-type: default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'stub-installer', 'msi'] - esr68: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar', 'msi'] - # No stub installer in esr60 - esr60: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar'] + esr68: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi'] shipping-product: firefox treeherder: platform: firefox-release/opt diff --git a/taskcluster/ci/repackage-l10n/kind.yml b/taskcluster/ci/repackage-l10n/kind.yml index c82d0f538b73..fcc907e9656c 100644 --- a/taskcluster/ci/repackage-l10n/kind.yml +++ b/taskcluster/ci/repackage-l10n/kind.yml @@ -67,11 +67,11 @@ job-template: by-release-type: esr(60|68): by-build-platform: - linux.*: [mar, mar-bz2] - linux4\b.*: [mar, mar-bz2] - macosx64\b.*: [mar, mar-bz2, dmg] - win32\b.*: [mar, mar-bz2, installer] - win64\b.*: [mar, mar-bz2, installer] + linux.*: [mar] + linux4\b.*: [mar] + macosx64\b.*: [mar, dmg] + win32\b.*: [mar, installer] + win64\b.*: [mar, installer] default: by-build-platform: linux.*: [mar] diff --git a/taskcluster/ci/repackage/kind.yml b/taskcluster/ci/repackage/kind.yml index 7193ca9da615..561c923c9155 100644 --- a/taskcluster/ci/repackage/kind.yml +++ b/taskcluster/ci/repackage/kind.yml @@ -77,11 +77,11 @@ job-template: by-release-type: esr(60|68): by-build-platform: - linux.*: [mar, mar-bz2] - linux4\b.*: [mar, mar-bz2] - macosx64\b.*: [mar, mar-bz2, dmg] - win32\b.*: [mar, mar-bz2, installer] - win64\b.*: [mar, mar-bz2, installer] + linux.*: [mar] + linux4\b.*: [mar] + macosx64\b.*: [mar, dmg] + win32\b.*: [mar, installer] + win64\b.*: [mar, installer] default: by-build-platform: linux.*: [mar] diff --git a/taskcluster/taskgraph/manifests/firefox_candidates.yml b/taskcluster/taskgraph/manifests/firefox_candidates.yml index 8c7e17e389fc..3151c1cc6a64 100644 --- a/taskcluster/taskgraph/manifests/firefox_candidates.yml +++ b/taskcluster/taskgraph/manifests/firefox_candidates.yml @@ -395,18 +395,6 @@ mapping: update_balrog_manifest: true destinations: - ${version}-candidates/build${build_number}/update/${path_platform} - target.bz2.complete.mar: - <<: *default - description: "Complete MAR with bz2 compression and SHA1 signing to serve as updates" - all_locales: true - from: - - mar-signing - pretty_name: firefox-${version}.bz2.complete.mar - checksums_path: update/${path_platform}/${locale}/firefox-${version}.bz2.complete.mar - update_balrog_manifest: true - balrog_format: bz2 - destinations: - - ${version}-candidates/build${build_number}/update/${path_platform} ${partial}: <<: *default description: "Partials MAR files to serve as updates" diff --git a/taskcluster/taskgraph/transforms/bouncer_submission.py b/taskcluster/taskgraph/transforms/bouncer_submission.py index 2c9f1050f0ab..1d91690fa293 100644 --- a/taskcluster/taskgraph/transforms/bouncer_submission.py +++ b/taskcluster/taskgraph/transforms/bouncer_submission.py @@ -60,13 +60,6 @@ CONFIG_PER_BOUNCER_PRODUCT = { 'default': '{product}-{version}.complete.mar', }, }, - 'complete-mar-bz2': { - 'name_postfix': '-Complete-bz2', - 'path_template': RELEASES_PATH_TEMPLATE, - 'file_names': { - 'default': '{product}-{version}.bz2.complete.mar', - }, - }, 'installer': { 'path_template': RELEASES_PATH_TEMPLATE, 'file_names': { diff --git a/taskcluster/taskgraph/transforms/mar_signing.py b/taskcluster/taskgraph/transforms/mar_signing.py index 56d3cfdcef41..9759821eb94a 100644 --- a/taskcluster/taskgraph/transforms/mar_signing.py +++ b/taskcluster/taskgraph/transforms/mar_signing.py @@ -27,7 +27,6 @@ SIGNING_FORMATS = { }, 'default': { 'target.complete.mar': ['autograph_hash_only_mar384'], - 'target.bz2.complete.mar': ['mar'], }, } diff --git a/taskcluster/taskgraph/transforms/repackage.py b/taskcluster/taskgraph/transforms/repackage.py index b5237dd1df69..d21ee27704cb 100644 --- a/taskcluster/taskgraph/transforms/repackage.py +++ b/taskcluster/taskgraph/transforms/repackage.py @@ -96,18 +96,6 @@ PACKAGE_FORMATS = { }, 'output': "target.complete.mar", }, - 'mar-bz2': { - 'args': [ - 'mar', "--format", "bz2", - '--arch', '{architecture}', - '--mar-channel-id', '{mar-channel-id}', - ], - 'inputs': { - 'input': 'target{archive_format}', - 'mar': 'mar', - }, - 'output': "target.bz2.complete.mar", - }, 'msi': { 'args': ['msi', '--wsx', '{wsx-stub}', '--version', '{version_display}',