Bug 1599223 - remove target.bz2.complete.mar r=tomprince
authorAki Sasaki <asasaki@mozilla.com>
Mon, 25 Nov 2019 21:49:47 +0000
changeset 503749 9805fb607886316de95ae7e4bed2c2e1061f78ab
parent 503748 9d28ee24c3772c25c4995d202bc23e4484854dc0
child 503750 a9de318848b60f57ada623808db6f969c69ad908
push id101521
push userasasaki@mozilla.com
push dateMon, 25 Nov 2019 22:15:58 +0000
treeherderautoland@9805fb607886 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince
bugs1599223
milestone72.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1599223 - remove target.bz2.complete.mar r=tomprince Differential Revision: https://phabricator.services.mozilla.com/D54613
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/ci/release-bouncer-sub-nazgul/kind.yml
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/ci/repackage-l10n/kind.yml
taskcluster/ci/repackage/kind.yml
taskcluster/taskgraph/manifests/firefox_candidates.yml
taskcluster/taskgraph/transforms/bouncer_submission.py
taskcluster/taskgraph/transforms/mar_signing.py
taskcluster/taskgraph/transforms/repackage.py
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -50,38 +50,16 @@ jobs:
                     default: []
             platforms: ["linux", "linux64", "macosx64", "win32", "win64", "win64-aarch64"]
         treeherder:
             platform: firefox-release/opt
             symbol: Rel(BPFx)
             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
         shipping-product: devedition
         run-on-releases: [beta]
         worker:
             product: devedition
             channel-names: ["aurora", "aurora-localtest", "aurora-cdntest"]
--- a/taskcluster/ci/release-bouncer-sub-nazgul/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub-nazgul/kind.yml
@@ -49,19 +49,17 @@ jobs:
         treeherder:
             platform: fennec-release/opt
 
     firefox:
         bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64', 'win64-aarch64']
         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
 
     firefox-rc:
         bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64', 'win64-aarch64']
         bouncer-products: ['complete-mar-candidates', 'partial-mar-candidates']
         shipping-product: firefox
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@@ -49,19 +49,17 @@ jobs:
         treeherder:
             platform: fennec-release/opt
 
     firefox:
         bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64', 'win64-aarch64']
         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
 
     firefox-rc:
         bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64', 'win64-aarch64']
         bouncer-products: ['complete-mar-candidates', 'partial-mar-candidates']
         shipping-product: firefox
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -62,21 +62,21 @@ job-template:
                 win64-aarch64\b.*:
                     - repackage/base.py
                     - repackage/win64-aarch64_sfx_stub.py
                     - repackage/win64_signed.py
     package-formats:
         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]
                     linux4\b.*: [mar]
                     macosx64\b.*: [mar, dmg]
                     win32\b.*: [mar, installer]
                     win64\b.*: [mar, installer]
     fetches:
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -72,21 +72,21 @@ job-template:
                 win64-aarch64\b.*:
                     - repackage/base.py
                     - repackage/win64-aarch64_sfx_stub.py
                     - repackage/win64_signed.py
     package-formats:
         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]
                     linux4\b.*: [mar]
                     macosx64\b.*: [mar, dmg]
                     win32\b.*: [mar, installer]
                     win64\b.*: [mar, installer]
     fetches:
--- a/taskcluster/taskgraph/manifests/firefox_candidates.yml
+++ b/taskcluster/taskgraph/manifests/firefox_candidates.yml
@@ -390,28 +390,16 @@ mapping:
         all_locales: true
         from:
             - mar-signing
         pretty_name: firefox-${version}.complete.mar
         checksums_path: update/${path_platform}/${locale}/firefox-${version}.complete.mar
         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"
         all_locales: true
         from:
             - partials-signing
         partials_only: true
         pretty_name: firefox-${previous_version}-${version}.partial.mar
--- a/taskcluster/taskgraph/transforms/bouncer_submission.py
+++ b/taskcluster/taskgraph/transforms/bouncer_submission.py
@@ -55,23 +55,16 @@ CONFIG_PER_BOUNCER_PRODUCT = {
     },
     'complete-mar-candidates': {
         'name_postfix': 'build{build_number}-Complete',
         'path_template': CANDIDATES_PATH_TEMPLATE,
         'file_names': {
             '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': {
             'linux': '{product}-{version}.tar.bz2',
             'linux64': '{product}-{version}.tar.bz2',
             'osx': '{pretty_product}%20{version}.dmg',
             'win': '{pretty_product}%20Setup%20{version}.exe',
             'win64': '{pretty_product}%20Setup%20{version}.exe',
--- a/taskcluster/taskgraph/transforms/mar_signing.py
+++ b/taskcluster/taskgraph/transforms/mar_signing.py
@@ -22,17 +22,16 @@ import logging
 logger = logging.getLogger(__name__)
 
 SIGNING_FORMATS = {
     'mar-signing-autograph-stage': {
         'target.complete.mar': ['autograph_stage_mar384'],
     },
     'default': {
         'target.complete.mar': ['autograph_hash_only_mar384'],
-        'target.bz2.complete.mar': ['mar'],
     },
 }
 
 transforms = TransformSequence()
 
 
 def generate_partials_artifacts(job, release_history, platform, locale=None):
     artifact_prefix = get_artifact_prefix(job)
--- a/taskcluster/taskgraph/transforms/repackage.py
+++ b/taskcluster/taskgraph/transforms/repackage.py
@@ -91,28 +91,16 @@ PACKAGE_FORMATS = {
             '--mar-channel-id', '{mar-channel-id}',
         ],
         'inputs': {
             'input': 'target{archive_format}',
             'mar': 'mar-tools/mar',
         },
         '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}',
                  '--locale', '{_locale}',
                  '--arch', '{architecture}',
                  '--candle', '{fetch-dir}/candle.exe',
                  '--light', '{fetch-dir}/light.exe'],
         'inputs': {