Bug 1598436 - add ESR bouncer checks to cron, r=aki

Fixes up ESR bouncer aliases now that ESR60 is EOL. Adds check for latest products used by www.mozilla.org. Enables the cron checks. Fixes up a script error which meant we weren't checking all partial platforms in release automation. Depends on D54656 Differential Revision: https://phabricator.services.mozilla.com/D54657 --HG-- extra : moz-landing-system : lando
dothq · Nov 27, 2019 · c7bf333 · c7bf333
1 parent 8f795e2
commit c7bf333
Show file tree

Hide file tree

Showing 5 changed files with 78 additions and 14 deletions.
diff --git a/.cron.yml b/.cron.yml
@@ -155,6 +155,7 @@ jobs:
       run-on-projects:
           - mozilla-beta
           - mozilla-release
+          - mozilla-esr68
       when:
           by-project:
               # No default branch
@@ -164,6 +165,9 @@ jobs:
               mozilla-release:
                   - {hour: 7, minute: 0}
                   - {hour: 19, minute: 0}
+              mozilla-esr68:
+                  - {hour: 7, minute: 0}
+                  - {hour: 19, minute: 0}
 
     - name: periodic-update
       job:

diff --git a/taskcluster/ci/cron-bouncer-check/kind.yml b/taskcluster/ci/cron-bouncer-check/kind.yml
@@ -50,8 +50,8 @@ jobs:
                 by-project:
                     mozilla-beta: LATEST_FIREFOX_RELEASED_DEVEL_VERSION
                     mozilla-release: LATEST_FIREFOX_VERSION
-                    mozilla-esr60: FIREFOX_ESR
-                    mozilla-esr68: FIREFOX_ESR_NEXT
+                    mozilla-esr68: FIREFOX_ESR
+                    # mozilla-esrXX: FIREFOX_ESR_NEXT
                     default: LATEST_FIREFOX_DEVEL_VERSION
             products-url: https://product-details.mozilla.org/1.0/firefox_versions.json
         treeherder:

diff --git a/taskcluster/ci/release-bouncer-aliases/kind.yml b/taskcluster/ci/release-bouncer-aliases/kind.yml
@@ -75,11 +75,14 @@ jobs:
                     firefox-latest: installer
                     firefox-stub: stub-installer
                     firefox-msi-latest-ssl: msi
-                mozilla-esr60:
+                mozilla-esr68:
+                    # when there is one ESR branch both sets of aliases work
+                    # when there are two ESR branches ...
+                    # ... these always point to the older branch
                     firefox-esr-latest-ssl: installer-ssl
                     firefox-esr-latest: installer
                     firefox-esr-msi-latest-ssl: msi
-                mozilla-esr68:
+                    # ... these point to the newer branch
                     firefox-esr-next-latest-ssl: installer-ssl
                     firefox-esr-next-latest: installer
                     firefox-esr-next-msi-latest-ssl: msi

diff --git a/testing/mozharness/configs/releases/bouncer_firefox_esr.py b/testing/mozharness/configs/releases/bouncer_firefox_esr.py
@@ -1,59 +1,115 @@
 # lint_ignore=E501
 config = {
     "products": {
+        # for installers, stubs, msi (ie not updates) ...
+        # products containing "latest" are for www.mozilla.org via cron-bouncer-check
+        # products using versions are for release automation via release-bouncer-check-firefox
         "installer": {
             "product-name": "Firefox-%(version)s",
             "check_uptake": True,
-            # convert to firefox-esr-latest when ESR52 stops
             "platforms": [
                 "linux",
                 "linux64",
                 "osx",
                 "win",
                 "win64",
+                "win64-aarch64",
+            ],
+        },
+        "installer-latest": {
+            "product-name": "Firefox-esr-latest",
+            "check_uptake": True,
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+                "win64-aarch64",
+            ],
+        },
+        "installer-next-latest": {
+            "product-name": "Firefox-esr-next-latest",
+            "check_uptake": True,
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+                "win64-aarch64",
             ],
         },
         "installer-ssl": {
             "product-name": "Firefox-%(version)s-SSL",
             "check_uptake": True,
-            # convert to firefox-esr-latest-ssl when ESR52 stops
             "platforms": [
                 "linux",
                 "linux64",
                 "osx",
                 "win",
                 "win64",
+               "win64-aarch64",
             ],
         },
-        "msi": {
-            "product-name": "Firefox-%(version)s-msi-SSL",
+        "installer-latest-ssl": {
+            "product-name": "Firefox-esr-latest-SSL",
             "check_uptake": True,
             "platforms": [
+                "linux",
+                "linux64",
+                "osx",
                 "win",
                 "win64",
+                "win64-aarch64",
             ],
         },
-        "complete-mar": {
-            "product-name": "Firefox-%(version)s-Complete",
+        "installer-next-latest-ssl": {
+            "product-name": "Firefox-esr-next-latest-SSL",
             "check_uptake": True,
             "platforms": [
                 "linux",
                 "linux64",
                 "osx",
                 "win",
                 "win64",
+                "win64-aarch64",
+            ],
+        },
+        "msi": {
+            "product-name": "Firefox-%(version)s-msi-SSL",
+            "check_uptake": True,
+            "platforms": [
+                "win",
+                "win64",
+            ],
+        },
+        "msi-latest": {
+            "product-name": "Firefox-esr-msi-latest-SSL",
+            "check_uptake": True,
+            "platforms": [
+                "win",
+                "win64",
             ],
         },
-        "complete-mar-bz2": {
-            "product-name": "Firefox-%(version)s-Complete-bz2",
+        "msi-next-latest": {
+            "product-name": "Firefox-esr-next-msi-latest-SSL",
+            "check_uptake": True,
+            "platforms": [
+                "win",
+                "win64",
+            ],
+        },
+        "complete-mar": {
+            "product-name": "Firefox-%(version)s-Complete",
             "check_uptake": True,
             "platforms": [
                 "linux",
                 "linux64",
                 "osx",
                 "win",
                 "win64",
-                "win64-aarch64",
+                # add "win64-aarch64" when ESR60 dropped
             ],
         },
     },
@@ -67,6 +123,7 @@
                 "osx",
                 "win",
                 "win64",
+                # add "win64-aarch64" when ESR60 dropped
             ],
         },
     },

diff --git a/testing/mozharness/scripts/release/bouncer_check.py b/testing/mozharness/scripts/release/bouncer_check.py
@@ -150,7 +150,7 @@ def get_urls(self):
             for prev_version in self.config.get("prev_versions", []):
                 product_name = product["product-name"] % {"version": self.config["version"],
                                                           "prev_version": prev_version}
-                for bouner_platform in product["platforms"]:
+                for bouncer_platform in product["platforms"]:
                     for locale in self.config["locales"]:
                         url = BOUNCER_URL_PATTERN.format(
                             bouncer_prefix=self.config["bouncer_prefix"],