Bug 1599223 - Remove target.bz2.complete.mar. r=tomprince a=release
authorAki Sasaki <asasaki@mozilla.com>
Mon, 25 Nov 2019 20:54:57 +0000
changeset 524174 64d9b4365269d738c0f7de0f15233d0bc9ef2a06
parent 524173 1f8b2df421868ed3ae3571209e794ee10889c2b8
child 524175 fd17b62d5247816244c319271800ef1df2697c82
push id626
push userryanvm@gmail.com
push dateMon, 25 Nov 2019 23:08:03 +0000
treeherdermozilla-esr68@64d9b4365269 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstomprince, release
bugs1599223
milestone68.3.0
Bug 1599223 - Remove target.bz2.complete.mar. r=tomprince a=release Differential Revision: https://phabricator.services.mozilla.com/D54608
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/beetmover_repackage.py
taskcluster/taskgraph/transforms/bouncer_submission.py
taskcluster/taskgraph/transforms/mar_signing.py
taskcluster/taskgraph/transforms/repackage.py
--- 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
@@ -61,19 +61,17 @@ jobs:
         attributes:
             release-type: release
 
     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
@@ -60,20 +60,20 @@ 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]
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -70,20 +70,20 @@ 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]
--- a/taskcluster/taskgraph/manifests/firefox_candidates.yml
+++ b/taskcluster/taskgraph/manifests/firefox_candidates.yml
@@ -346,28 +346,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/beetmover_repackage.py
+++ b/taskcluster/taskgraph/transforms/beetmover_repackage.py
@@ -133,17 +133,16 @@ UPSTREAM_ARTIFACT_SIGNED_REPACKAGE_PATHS
 ]
 
 UPSTREAM_ARTIFACT_SIGNED_MSI_PATHS = [
     'target.installer.msi',
 ]
 
 UPSTREAM_ARTIFACT_SIGNED_MAR_PATHS = [
     'target.complete.mar',
-    'target.bz2.complete.mar',
 ]
 
 beetmover_description_schema = schema.extend({
     # depname is used in taskref's to identify the taskID of the unsigned things
     Required('depname', default='build'): basestring,
 
     # unique label to describe this beetmover task, defaults to {dep.label}-beetmover
     Required('label'): basestring,
--- 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
@@ -86,27 +86,16 @@ PACKAGE_FORMATS = {
             '--arch', '{architecture}',
         ],
         'inputs': {
             'input': 'target{archive_format}',
             'mar': 'mar{executable_extension}',
         },
         'output': "target.complete.mar",
     },
-    'mar-bz2': {
-        'args': [
-            'mar', "--format", "bz2",
-            '--arch', '{architecture}',
-        ],
-        'inputs': {
-            'input': 'target{archive_format}',
-            'mar': 'mar{executable_extension}',
-        },
-        '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': {