Bug 1552389 - Port bug 1551738: Complete ESR68 support in CI. r=darktrojan a=jorgk THUNDERBIRD_68_0b2_BUILD2 THUNDERBIRD_68_0b2_RELEASE
authorRob Lemley <rob@thunderbird.net>
Wed, 19 Jun 2019 16:52:18 -0400
changeset 34708 2f3bec79082f99a13888a96092f4198243483ecc
parent 34707 8333ea9024d136d1a5a00a529c0ff8887a2732dd
child 34709 225d70ebc981110ce4c4c3cc697960c836ec7118
push id2434
push usermozilla@jorgk.com
push dateFri, 21 Jun 2019 20:33:26 +0000
treeherdercomm-beta@2f3bec79082f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdarktrojan, jorgk
bugs1552389, 1551738
Bug 1552389 - Port bug 1551738: Complete ESR68 support in CI. r=darktrojan a=jorgk This completes the changes needed for comm-esr68 in Taskcluster based on changes in Firefox.
taskcluster/ci/beetmover-checksums/kind.yml
taskcluster/ci/beetmover-repackage/kind.yml
taskcluster/ci/release-balrog-scheduling/kind.yml
taskcluster/ci/release-balrog-submit-toplevel/kind.yml
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/ci/release-update-verify-config/kind.yml
taskcluster/ci/repackage-l10n/kind.yml
taskcluster/ci/repackage/kind.yml
--- a/taskcluster/ci/beetmover-checksums/kind.yml
+++ b/taskcluster/ci/beetmover-checksums/kind.yml
@@ -16,11 +16,11 @@ only-for-attributes:
     - nightly
     - shippable
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_prefix: public
         artifact_map:
-            by-project:
-                comm-(beta|esr60|esr68): comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates_checksums.yml
+            by-release-type:
+                beta|release.*|esr.*: comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates_checksums.yml
                 default: comm/taskcluster/comm_taskgraph/manifests/thunderbird_nightly_checksums.yml
--- a/taskcluster/ci/beetmover-repackage/kind.yml
+++ b/taskcluster/ci/beetmover-repackage/kind.yml
@@ -36,11 +36,11 @@ only-for-build-platforms:
     - macosx64-shippable/opt
     - win32-shippable/opt
     - win64-shippable/opt
 
 job-template:
     shipping-phase: promote
     attributes:
         artifact_map:
-            by-project:
-                comm-(beta|esr60|esr68): comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates.yml
+            by-release-type:
+                beta|release.*|esr.*: comm/taskcluster/comm_taskgraph/manifests/thunderbird_candidates.yml
                 default: comm/taskcluster/comm_taskgraph/manifests/thunderbird_nightly.yml
--- a/taskcluster/ci/release-balrog-scheduling/kind.yml
+++ b/taskcluster/ci/release-balrog-scheduling/kind.yml
@@ -39,22 +39,8 @@ jobs:
                             beta: [43]
                             release: [729]
                             default: []
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BS)
             tier: 1
             kind: build
-    thunderbird-bz2:
-        description: Schedule Thunderbird publishing in balrog (bz2)
-        name: release-thunderbird_schedule_publishing_in_balrog-bz2
-        shipping-product: thunderbird
-        run-on-releases: [release]
-        worker:
-            product: thunderbird
-            publish-rules: [516]
-            blob-suffix: -bz2
-        treeherder:
-            platform: thunderbird-release/opt
-            symbol: Rel(BS-bz2)
-            tier: 1
-            kind: build
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@@ -35,54 +35,19 @@ jobs:
         shipping-product: thunderbird
         worker:
             product: thunderbird
             channel-names:
                 by-release-type:
                     beta: ["beta", "beta-localtest", "beta-cdntest"]
                     release: ["release", "release-localtest", "release-cdntest"]
                     default: []
-            publish-rules:
-                by-release-level:
-                    production:
-                        by-release-type:
-                            beta: [43]
-                            release: [820]
-                            default: []
-                    staging:
-                        by-release-type:
-                            beta: [43]
-                            release: [729]
-                            default: []
             rules-to-update:
                 by-release-type:
                     beta: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
                     release: ["thunderbird-release60-cdntest", "thunderbird-release60-localtest"]
                     default: []
             platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
         treeherder:
             platform: thunderbird-release/opt
             symbol: Rel(BPTb)
             tier: 1
             kind: build
-
-    thunderbird-bz2:
-        name: submit-toplevel-thunderbird-release-to-balrog-bz2
-        description: Submit toplevel Thunderbird release to balrog (bz2)
-        shipping-product: thunderbird
-        run-on-releases: [release]
-        worker:
-            product: thunderbird
-            channel-names: ["release", "release-localtest", "release-cdntest"]
-            publish-rules:
-                by-release-level:
-                    production: [516]
-                    staging: [516]
-            rules-to-update: ["thunderbird-esr52-cdntest", "thunderbird-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: thunderbird-release/opt
-            symbol: Rel(BPTb-bz2)
-            tier: 1
-            kind: build
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@@ -30,16 +30,12 @@ job-defaults:
     treeherder:
         symbol: Rel(BncSub)
         kind: test
         tier: 1
 
 jobs:
     thunderbird:
         bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64']
-        bouncer-products:
-            by-project:
-                comm-beta: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi']
-                comm-esr60: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar']
-                default: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi']
+        bouncer-products: ['complete-mar', 'installer', 'installer-ssl', 'partial-mar', 'msi']
         shipping-product: thunderbird
         treeherder:
             platform: thunderbird-release/opt
--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@@ -48,22 +48,25 @@ job-defaults:
             by-release-type:
                 beta: beta
                 release: nonbeta
                 default: beta
         last-watershed:
             by-release-type:
                 beta:
                     by-platform:
-                        win64.*: "60.0b7"
+                        win32.*: "68.0b1"
+                        win64.*: "68.0b1"
                         default: "56.0b3"
                 release:
                     by-platform:
                         win64.*: "60.0"
                         default: "52.0"
+                # For 68.0 release have a watershed on 60.8
+                # release: "60.8"
                 default: "default"
 
 jobs:
     thunderbird-linux:
         shipping-product: thunderbird
         treeherder:
             symbol: UVC
             platform: linux32/opt
--- a/taskcluster/ci/repackage-l10n/kind.yml
+++ b/taskcluster/ci/repackage-l10n/kind.yml
@@ -42,23 +42,14 @@ job-template:
                     - repackage/osx_signed.py
                 win32.*:
                     - repackage/base.py
                     - repackage/win32_signed.py
                 win64.*:
                     - repackage/base.py
                     - repackage/win64_signed.py
     package-formats:
-        by-release-type:
-            release:
-                by-build-platform:
-                    linux-.*: [mar, mar-bz2]
-                    linux64.*: [mar, mar-bz2]
-                    macosx64.*: [mar, mar-bz2, dmg]
-                    win32.*: [mar, mar-bz2, installer]
-                    win64.*: [mar, mar-bz2, installer]
-            default:
-                by-build-platform:
-                    linux-.*: [mar]
-                    linux64.*: [mar]
-                    macosx64.*: [mar, dmg]
-                    win32.*: [mar, installer]
-                    win64.*: [mar, installer]
+        by-build-platform:
+            linux-.*: [mar]
+            linux64.*: [mar]
+            macosx64.*: [mar, dmg]
+            win32.*: [mar, installer]
+            win64.*: [mar, installer]
--- a/taskcluster/ci/repackage/kind.yml
+++ b/taskcluster/ci/repackage/kind.yml
@@ -41,23 +41,14 @@ job-template:
                     - repackage/osx_signed.py
                 win32.*:
                     - repackage/base.py
                     - repackage/win32_signed.py
                 win64.*:
                     - repackage/base.py
                     - repackage/win64_signed.py
     package-formats:
-        by-release-type:
-            release:
-                by-build-platform:
-                    linux-.*: [mar, mar-bz2]
-                    linux64.*: [mar, mar-bz2]
-                    macosx64.*: [mar, mar-bz2, dmg]
-                    win32.*: [mar, mar-bz2, installer]
-                    win64.*: [mar, mar-bz2, installer]
-            default:
-                by-build-platform:
-                    linux-.*: [mar]
-                    linux64.*: [mar]
-                    macosx64.*: [mar, dmg]
-                    win32.*: [mar, installer]
-                    win64.*: [mar, installer]
+        by-build-platform:
+            linux-.*: [mar]
+            linux64.*: [mar]
+            macosx64.*: [mar, dmg]
+            win32.*: [mar, installer]
+            win64.*: [mar, installer]