Bug 1551738: Add esr68 support to bouncer tasks; r=bhearsum
authorTom Prince <mozilla@hocat.ca>
Mon, 20 May 2019 03:31:25 +0000
changeset 474467 fc802388a319cf7d66bba48888c3a2dfc417b0d9
parent 474466 7144d26d331ccd17dc9c5b3a79f424fc53a0f1dc
child 474468 18424e63cc37e48381a9990711c15df166b8c495
push id36040
push userrgurzau@mozilla.com
push dateMon, 20 May 2019 13:43:21 +0000
treeherdermozilla-central@319a369ccde4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum
bugs1551738
milestone68.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 1551738: Add esr68 support to bouncer tasks; r=bhearsum Differential Revision: https://phabricator.services.mozilla.com/D31651
taskcluster/ci/cron-bouncer-check/kind.yml
taskcluster/ci/release-bouncer-aliases/kind.yml
taskcluster/ci/release-bouncer-check/kind.yml
taskcluster/ci/release-bouncer-sub/kind.yml
taskcluster/taskgraph/transforms/bouncer_submission.py
testing/mozharness/configs/releases/bouncer_firefox_esr.py
--- a/taskcluster/ci/cron-bouncer-check/kind.yml
+++ b/taskcluster/ci/cron-bouncer-check/kind.yml
@@ -37,25 +37,26 @@ jobs:
             job-name: firefox-bouncer-check
         run:
             config:
                 by-release-type:
                     beta:
                         - releases/bouncer_firefox_beta.py
                     release:
                         - releases/bouncer_firefox_release.py
-                    esr60:
+                    esr.*:
                         - releases/bouncer_firefox_esr.py
                     default:
                         - releases/bouncer_firefox_beta.py
             product-field:
                 by-project:
                     mozilla-beta: LATEST_FIREFOX_RELEASED_DEVEL_VERSION
                     mozilla-release: LATEST_FIREFOX_VERSION
                     mozilla-esr60: FIREFOX_ESR
+                    mozilla-esr68: FIREFOX_ESR_NEXT
                     default: LATEST_FIREFOX_DEVEL_VERSION
             products-url: https://product-details.mozilla.org/1.0/firefox_versions.json
         treeherder:
             platform: firefox-release/opt
 
     devedition:
         shipping-product: devedition
         run-on-projects: [mozilla-beta]
--- a/taskcluster/ci/release-bouncer-aliases/kind.yml
+++ b/taskcluster/ci/release-bouncer-aliases/kind.yml
@@ -74,16 +74,20 @@ jobs:
                     firefox-latest-ssl: installer-ssl
                     firefox-latest: installer
                     firefox-stub: stub-installer
                     firefox-msi-latest-ssl: msi
                 mozilla-esr60:
                     firefox-esr-latest-ssl: installer-ssl
                     firefox-esr-latest: installer
                     firefox-esr-msi-latest-ssl: msi
+                mozilla-esr68:
+                    firefox-esr-next-latest-ssl: installer-ssl
+                    firefox-esr-next-latest: installer
+                    firefox-esr-next-msi-latest-ssl: msi
                 birch:
                     firefox-latest-ssl: installer-ssl
                     firefox-latest: installer
                     firefox-stub: stub-installer
                 jamun:
                     firefox-esr-latest-ssl: installer-ssl
                     firefox-esr-latest: installer
                 maple:
--- a/taskcluster/ci/release-bouncer-check/kind.yml
+++ b/taskcluster/ci/release-bouncer-check/kind.yml
@@ -52,17 +52,17 @@ jobs:
             job-name: firefox-release-bouncer-check
         run:
             config:
                 by-release-type:
                     beta:
                         - releases/bouncer_firefox_beta.py
                     release:
                         - releases/bouncer_firefox_release.py
-                    esr60:
+                    esr.*:
                         - releases/bouncer_firefox_esr.py
                     default:
                         - releases/bouncer_firefox_beta.py
         treeherder:
             platform: firefox-release/opt
 
     devedition:
         shipping-product: devedition
--- a/taskcluster/ci/release-bouncer-sub/kind.yml
+++ b/taskcluster/ci/release-bouncer-sub/kind.yml
@@ -47,21 +47,21 @@ jobs:
         shipping-product: fennec
         locales-file: mobile/locales/l10n-changesets.json
         treeherder:
             platform: fennec-release/opt
 
     firefox:
         bouncer-platforms: ['linux', 'linux64', 'osx', 'win', 'win64', 'win64-aarch64']
         bouncer-products:
-            by-project:
+            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
-                mozilla-esr60: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar']
-                jamun: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar']
+                esr60: ['complete-mar', 'complete-mar-bz2', 'installer', 'installer-ssl', 'partial-mar']
         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/taskgraph/transforms/bouncer_submission.py
+++ b/taskcluster/taskgraph/transforms/bouncer_submission.py
@@ -126,17 +126,18 @@ def make_task_worker(config, jobs):
             job, 'worker-type', item_name=job['name'],
             **{'release-level': config.params.release_level()}
         )
         resolve_keyed_by(
             job, 'scopes', item_name=job['name'],
             **{'release-level': config.params.release_level()}
         )
         resolve_keyed_by(
-            job, 'bouncer-products', item_name=job['name'], project=config.params['project']
+            job, 'bouncer-products', item_name=job['name'],
+            **{'release-type': config.params['release_type']}
         )
 
         # No need to filter out ja-JP-mac, we need to upload both; but we do
         # need to filter out the platforms they come with
         all_locales = sorted([
             locale
             for locale in parse_locales_file(job['locales-file']).keys()
             if locale not in ('linux', 'win32', 'osx')
--- a/testing/mozharness/configs/releases/bouncer_firefox_esr.py
+++ b/testing/mozharness/configs/releases/bouncer_firefox_esr.py
@@ -39,16 +39,28 @@ config = {
             "platforms": [
                 "linux",
                 "linux64",
                 "osx",
                 "win",
                 "win64",
             ],
         },
+        "complete-mar-bz2": {
+            "product-name": "Firefox-%(version)s-Complete-bz2",
+            "check_uptake": True,
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+                "win64-aarch64",
+            ],
+        },
     },
     "partials": {
         "releases-dir": {
             "product-name": "Firefox-%(version)s-Partial-%(prev_version)s",
             "check_uptake": True,
             "platforms": [
                 "linux",
                 "linux64",