Bug 1475868: Add support for releasing off comm-esr60 in taskcluster; r=me

--HG-- rename : mozharness/single_locale/comm-beta.py => mozharness/single_locale/comm-esr60.py extra : source : 1ed2ae44fc2e407193cc13a20d0562e138bd2013 extra : histedit_source : 570104a15b80b8debdd0f11c6694d181dd7f3c74
2018-07-13 14:59:50 -06:00 · 2018-07-13 14:59:50 -06:00 · 9c8ffdb463
--- a/mozharness/builds/branch_specifics.py
+++ b/mozharness/builds/branch_specifics.py
@ -69,6 +69,43 @@ config = {
            },
        },
    },
+    "comm-esr60": {
+        "enable_release_promotion": True,
+        'repo_path': 'releases/comm-esr60',
+        'update_channel': 'beta',
+        'platform_overrides': {
+            'linux': {
+                'mozconfig_variant': 'release',
+            },
+            'linux64': {
+                'mozconfig_variant': 'release',
+            },
+            'macosx64': {
+                'mozconfig_variant': 'release',
+            },
+            'win32': {
+                'mozconfig_variant': 'release',
+            },
+            'win64': {
+                'mozconfig_variant': 'release',
+            },
+            'linux-debug': {
+                'update_channel': 'default',
+            },
+            'linux64-debug': {
+                'update_channel': 'default',
+            },
+            'macosx64-debug': {
+                'update_channel': 'default',
+            },
+            'win32-debug': {
+                'update_channel': 'default',
+            },
+            'win64-debug': {
+                'update_channel': 'default',
+            },
+        },
+    },
    'try-comm-central': {
        'repo_path': 'try-comm-central',
    },
--- a/mozharness/single_locale/comm-esr60.py
+++ b/mozharness/single_locale/comm-esr60.py
@ -0,0 +1,12 @@
+import os
+config = {
+    "app_name": "comm/mail",
+    "nightly_build": True,
+    "branch": "comm-esr60",
+    'is_automation': True,
+
+    "mar_tools_url": os.environ["MAR_TOOLS_URL"],
+    "hg_l10n_base": "https://hg.mozilla.org/l10n-central",
+
+    "update_channel": "esr",
+}
--- a/taskcluster/ci/config.yml
+++ b/taskcluster/ci/config.yml
@ -66,7 +66,7 @@ scriptworker:
        'scriptworker-prov-v1/tb-balrog-v1':
            - 'project:comm:thunderbird:releng:balrog:server:nightly'
            - 'project:comm:thunderbird:releng:balrog:server:beta'
-            - 'project:comm:thunderbird:releng:balrog:server:esr'
+            - 'project:comm:thunderbird:releng:balrog:server:release'

 partner:
    release: {}
--- a/taskcluster/ci/release-balrog-scheduling/kind.yml
+++ b/taskcluster/ci/release-balrog-scheduling/kind.yml
@ -29,6 +29,7 @@ jobs:
            publish-rules:
                by-project:
                    comm-beta: [43]
+                    comm-esr60: [820]
                    default: []
        treeherder:
            platform: thunderbird-release/opt
--- a/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
+++ b/taskcluster/ci/release-balrog-submit-toplevel/kind.yml
@ -26,25 +26,28 @@ jobs:
            product: thunderbird
            archive-domain:
                by-project:
-                    comm-beta: archive.mozilla.org
+                    comm-(beta|esr.*): archive.mozilla.org
                    default: ftp.stage.mozaws.net
            download-domain:
                by-project:
-                    comm-beta: download.mozilla.org
+                    comm-(beta|esr.*): download.mozilla.org
                    default: bouncer-bouncer-releng.stage.mozaws.net
            channel-names:
                by-project:
                    try-comm-central: ["beta", "beta-localtest", "beta-cdntest"]
                    comm-beta: ["beta", "beta-localtest", "beta-cdntest"]
+                    comm-esr.*: ["release", "release-localtest", "release-cdntest"]
                    default: []
            publish-rules:
                by-project:
                    comm-beta: [43]
+                    comm-esr60: [820]
                    default: []
            rules-to-update:
                by-project:
                    try-comm-central: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
                    comm-beta: ["thunderbird-beta-cdntest", "thunderbird-beta-localtest"]
+                    comm-esr60: ["thunderbird-release60-cdntest", "thunderbird-release60-localtest"]
                    default: []
            platforms: ["linux", "linux64", "macosx64", "win32", "win64"]
        treeherder:
--- a/taskcluster/ci/release-bouncer-aliases/kind.yml
+++ b/taskcluster/ci/release-bouncer-aliases/kind.yml
@ -16,17 +16,13 @@ job-defaults:
    description: Update bouncer aliases job
    worker-type:
        by-project:
-            comm-beta: scriptworker-prov-v1/tb-bouncer-v1
-            comm-esr.*: scriptworker-prov-v1/tb-bouncer-v1
+            comm-(beta|esr.*): scriptworker-prov-v1/tb-bouncer-v1
            default: scriptworker-prov-v1/tb-bouncer-dev
    worker:
        implementation: bouncer-aliases
    scopes:
        by-project:
-            comm-beta:
-                - project:comm:thunderbird:releng:bouncer:action:aliases
-                - project:comm:thunderbird:releng:bouncer:server:production
-            comm-esr.*:
+            comm-(beta|esr.*):
                - project:comm:thunderbird:releng:bouncer:action:aliases
                - project:comm:thunderbird:releng:bouncer:server:production
            default:
--- a/taskcluster/ci/release-bouncer-check/kind.yml
+++ b/taskcluster/ci/release-bouncer-check/kind.yml
@ -44,7 +44,7 @@ jobs:
                - releases/bouncer_thunderbird.py
            extra-config:
                by-project:
-                    comm-beta: {}
+                    comm-(beta|esr60): {}
                    default:
                        locales: ['en-US', 'fr', 'de']
                        bouncer_prefix: "https://bouncer-bouncer-releng.stage.mozaws.net/"
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@ -12,17 +12,13 @@ job-defaults:
    description: release bouncer submission job
    worker-type:
        by-project:
-            comm-beta: scriptworker-prov-v1/tb-bouncer-v1
-            comm-esr60: scriptworker-prov-v1/tb-bouncer-v1
+            comm-(beta|esr.*): scriptworker-prov-v1/tb-bouncer-v1
            default: scriptworker-prov-v1/tb-bouncer-dev
    worker:
        implementation: bouncer-submission
    scopes:
        by-project:
-            comm-beta:
-                - project:comm:thunderbird:releng:bouncer:action:submission
-                - project:comm:thunderbird:releng:bouncer:server:production
-            comm-esr.*:
+            comm-(beta|esr.*):
                - project:comm:thunderbird:releng:bouncer:action:submission
                - project:comm:thunderbird:releng:bouncer:server:production
            default:
--- a/taskcluster/ci/release-generate-checksums/kind.yml
+++ b/taskcluster/ci/release-generate-checksums/kind.yml
@ -62,10 +62,7 @@ jobs:
        run:
            extra-config:
                by-project:
-                    comm-esr.*:
-                        stage_product: "thunderbird"
-                        bucket_name: "net-mozaws-prod-delivery-archive"
-                    comm-beta:
+                    comm-(beta|esr.*):
                        stage_product: "thunderbird"
                        bucket_name: "net-mozaws-prod-delivery-archive"
                    default:
--- a/taskcluster/ci/release-mark-as-shipped/kind.yml
+++ b/taskcluster/ci/release-mark-as-shipped/kind.yml
@ -18,13 +18,13 @@ job-defaults:
    description: mark release as shipped in Ship-It
    worker-type:
        by-project:
-            comm-(beta|esr60): scriptworker-prov-v1/tb-shipit-v1
+            comm-(beta|esr.*): scriptworker-prov-v1/tb-shipit-v1
            default: scriptworker-prov-v1/tb-shipit-dev
    worker:
        implementation: shipit-shipped
    scopes:
        by-project:
-            comm-(beta|esr60): ['project:comm:thunderbird:releng:ship-it:production']
+            comm-(beta|esr.*): ['project:comm:thunderbird:releng:ship-it:production']
            default: ['project:comm:thunderbird:releng:ship-it:staging']
    run-on-projects: []
    shipping-phase: ship
--- a/taskcluster/ci/release-notify-promote/kind.yml
+++ b/taskcluster/ci/release-notify-promote/kind.yml
@ -35,7 +35,7 @@ job-defaults:
        emails:
            by-project:
                # ???
-                comm-(beta|esr60): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
                try-comm-central: ["{config[params][owner]}"]
                default: []

--- a/taskcluster/ci/release-notify-push/kind.yml
+++ b/taskcluster/ci/release-notify-push/kind.yml
@ -32,7 +32,7 @@ job-defaults:
        message: "{task[shipping-product]} {release_config[version]} build{release_config[build_number]}/{config[params][project]} has been pushed to cdntest"
        emails:
            by-project:
-                comm-(beta|esr60): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
                try-comm-central: ["{config[params][owner]}"]
                default: []

--- a/taskcluster/ci/release-notify-ship/kind.yml
+++ b/taskcluster/ci/release-notify-ship/kind.yml
@ -33,7 +33,7 @@ job-defaults:
    notifications:
        emails:
            by-project:
-                comm-(beta|esr60): ["thunderbird-drivers@mozilla.org"]
+                comm-(beta|esr.*): ["thunderbird-drivers@mozilla.org"]
                try: ["{config[params][owner]}"]
                default: []

--- a/taskcluster/ci/release-update-verify-config/kind.yml
+++ b/taskcluster/ci/release-update-verify-config/kind.yml
@ -56,7 +56,7 @@ job-defaults:
                    by-platform:
                        win64.*: "60.0b7"
                        default: "56.0b3"
-                comm-esr60: "60.0esr"
+                comm-esr60: "60.0"
                try-comm-central:
                    by-platform:
                        win64.*: "60.0b7"
@ -80,6 +80,7 @@ jobs:
            channel:
                by-project:
                    comm-beta: "beta-localtest"
+                    comm-esr.*: "release-localtest"
                    default: "default"
            mar-channel-id-override:
                by-project:
@ -103,6 +104,7 @@ jobs:
            channel:
                by-project:
                    comm-beta: "beta-localtest"
+                    comm-esr.*: "release-localtest"
                    default: "default"
            mar-channel-id-override:
                by-project:
@ -126,6 +128,7 @@ jobs:
            channel:
                by-project:
                    comm-beta: "beta-localtest"
+                    comm-esr.*: "release-localtest"
                    default: "default"
            mar-channel-id-override:
                by-project:
@ -172,6 +175,7 @@ jobs:
            channel:
                by-project:
                    comm-beta: "beta-localtest"
+                    comm-esr.*: "release-localtest"
                    default: "default"
            mar-channel-id-override:
                by-project:
--- a/taskcluster/ci/release-update-verify/kind.yml
+++ b/taskcluster/ci/release-update-verify/kind.yml
@ -38,6 +38,7 @@ job-defaults:
            CHANNEL:
                by-project:
                    comm-beta: "beta-localtest"
+                    comm-esr.*: "release-localtest"
                    try-comm-central: "beta-localtest"
                    default: "default"
    extra: