Bug 1541122: [mozharness] Simplify bouncer-check configuration to not include paths; r=mtabara
authorTom Prince <mozilla@hocat.ca>
Wed, 03 Apr 2019 20:33:48 +0000
changeset 525930 043e6648282f068b13f95f8df90ad543149a97dc
parent 525929 b746cd7942637ec5286703b1b5a5a1f5c24f7133
child 525931 52730b61818935abf5ba0e8ce6cce908675c789e
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmtabara
bugs1541122
milestone67.0
Bug 1541122: [mozharness] Simplify bouncer-check configuration to not include paths; r=mtabara These existed for when bouncer was updated via mozharness, and they are unused in bouncer-check. By removing the paths, we make the configuration easier to read and update. Differential Revision: https://phabricator.services.mozilla.com/D25838
testing/mozharness/configs/releases/bouncer_firefox_beta.py
testing/mozharness/configs/releases/bouncer_firefox_devedition.py
testing/mozharness/configs/releases/bouncer_firefox_esr.py
testing/mozharness/configs/releases/bouncer_firefox_release.py
testing/mozharness/configs/releases/bouncer_thunderbird.py
testing/mozharness/scripts/release/bouncer_check.py
--- a/testing/mozharness/configs/releases/bouncer_firefox_beta.py
+++ b/testing/mozharness/configs/releases/bouncer_firefox_beta.py
@@ -1,139 +1,67 @@
 # lint_ignore=E501
 config = {
     "products": {
         "installer": {
             "product-name": "Firefox-%(version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "installer-ssl": {
             "product-name": "Firefox-%(version)s-SSL",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "msi": {
             "product-name": "Firefox-%(version)s-msi-SSL",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "stub-installer": {
             "product-name": "Firefox-%(version)s-stub",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Installer.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Installer.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "complete-mar": {
             "product-name": "Firefox-%(version)s-Complete",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
     "partials": {
         "releases-dir": {
             "product-name": "Firefox-%(version)s-Partial-%(prev_version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
 }
--- a/testing/mozharness/configs/releases/bouncer_firefox_devedition.py
+++ b/testing/mozharness/configs/releases/bouncer_firefox_devedition.py
@@ -1,139 +1,67 @@
 # lint_ignore=E501
 config = {
     "products": {
         "installer": {
             "product-name": "Devedition-%(version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/devedition/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/devedition/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/devedition/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/devedition/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/devedition/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "installer-ssl": {
             "product-name": "Devedition-%(version)s-SSL",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/devedition/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/devedition/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/devedition/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/devedition/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/devedition/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "msi": {
             "product-name": "Devedition-%(version)s-msi-SSL",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/devedition/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/devedition/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "stub-installer": {
             "product-name": "Devedition-%(version)s-stub",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/devedition/releases/%(version)s/win32/:lang/Firefox%%20Installer.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/devedition/releases/%(version)s/win32/:lang/Firefox%%20Installer.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "complete-mar": {
             "product-name": "Devedition-%(version)s-Complete",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/devedition/releases/%(version)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/devedition/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/devedition/releases/%(version)s/update/mac/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/devedition/releases/%(version)s/update/win32/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/devedition/releases/%(version)s/update/win64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
     "partials": {
         "releases-dir": {
             "product-name": "Devedition-%(version)s-Partial-%(prev_version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/devedition/releases/%(version)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/devedition/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/devedition/releases/%(version)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/devedition/releases/%(version)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/devedition/releases/%(version)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
 }
--- a/testing/mozharness/configs/releases/bouncer_firefox_esr.py
+++ b/testing/mozharness/configs/releases/bouncer_firefox_esr.py
@@ -1,127 +1,61 @@
 # lint_ignore=E501
 config = {
     "products": {
         "installer": {
             "product-name": "Firefox-%(version)s",
             "check_uptake": True,
             # convert to firefox-esr-latest when ESR52 stops
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "installer-ssl": {
             "product-name": "Firefox-%(version)s-SSL",
             "check_uptake": True,
             # convert to firefox-esr-latest-ssl when ESR52 stops
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "msi": {
             "product-name": "Firefox-%(version)s-msi-SSL",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "complete-mar": {
             "product-name": "Firefox-%(version)s-Complete",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
     "partials": {
         "releases-dir": {
             "product-name": "Firefox-%(version)s-Partial-%(prev_version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
 }
--- a/testing/mozharness/configs/releases/bouncer_firefox_release.py
+++ b/testing/mozharness/configs/releases/bouncer_firefox_release.py
@@ -1,191 +1,88 @@
 # lint_ignore=E501
 config = {
     "products": {
         "installer": {
             "product-name": "Firefox-%(version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "installer-ssl": {
             "product-name": "Firefox-%(version)s-SSL",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/linux-i686/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/linux-x86_64/:lang/firefox-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/mac/:lang/Firefox%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "msi": {
             "product-name": "Firefox-%(version)s-msi-SSL",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win64/:lang/Firefox%%20Setup%%20%(version)s.msi",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "stub-installer": {
             "product-name": "Firefox-%(version)s-stub",
             "check_uptake": True,
-            "paths": {
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Installer.exe",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/win32/:lang/Firefox%%20Installer.exe",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "win",
+                "win64",
+            ],
         },
         "complete-mar": {
             "product-name": "Firefox-%(version)s-Complete",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "complete-mar-candidates": {
             "product-name": "Firefox-%(version)sbuild%(build_number)s-Complete",
             "check_uptake": False,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/linux-i686/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/linux-x86_64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/mac/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/win32/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/win64/:lang/firefox-%(version)s.complete.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
     "partials": {
         "releases-dir": {
             "product-name": "Firefox-%(version)s-Partial-%(prev_version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/releases/%(version)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/releases/%(version)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/releases/%(version)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/releases/%(version)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/releases/%(version)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
         "candidates-dir": {
             "product-name": "Firefox-%(version)sbuild%(build_number)s-Partial-%(prev_version)sbuild%(prev_build_number)s",
             "check_uptake": False,
-            "paths": {
-                "linux": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/linux-i686/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/linux-x86_64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/mac/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/win32/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win",
-                },
-                "win64": {
-                    "path": "/firefox/candidates/%(version)s-candidates/build%(build_number)s/update/win64/:lang/firefox-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win64",
-                },
-            },
+            "platforms": [
+                "linux64",
+                "osx",
+                "win",
+                "win64",
+            ],
         },
     },
 }
--- a/testing/mozharness/configs/releases/bouncer_thunderbird.py
+++ b/testing/mozharness/configs/releases/bouncer_thunderbird.py
@@ -1,95 +1,47 @@
 # lint_ignore=E501
 config = {
     "products": {
         "installer": {
             "product-name": "Thunderbird-%(version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/thunderbird/releases/%(version)s/linux-i686/:lang/thunderbird-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/thunderbird/releases/%(version)s/linux-x86_64/:lang/thunderbird-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/thunderbird/releases/%(version)s/mac/:lang/Thunderbird%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/thunderbird/releases/%(version)s/win32/:lang/Thunderbird%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+            ],
         },
         "installer-ssl": {
             "product-name": "Thunderbird-%(version)s-SSL",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/thunderbird/releases/%(version)s/linux-i686/:lang/thunderbird-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/thunderbird/releases/%(version)s/linux-x86_64/:lang/thunderbird-%(version)s.tar.bz2",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/thunderbird/releases/%(version)s/mac/:lang/Thunderbird%%20%(version)s.dmg",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/thunderbird/releases/%(version)s/win32/:lang/Thunderbird%%20Setup%%20%(version)s.exe",
-                    "bouncer-platform": "win",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+            ],
         },
         "complete-mar": {
             "product-name": "Thunderbird-%(version)s-Complete",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/thunderbird/releases/%(version)s/update/linux-i686/:lang/thunderbird-%(version)s.complete.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/thunderbird/releases/%(version)s/update/linux-x86_64/:lang/thunderbird-%(version)s.complete.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/thunderbird/releases/%(version)s/update/mac/:lang/thunderbird-%(version)s.complete.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/thunderbird/releases/%(version)s/update/win32/:lang/thunderbird-%(version)s.complete.mar",
-                    "bouncer-platform": "win",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+            ],
         },
     },
     "partials": {
         "releases-dir": {
             "product-name": "Thunderbird-%(version)s-Partial-%(prev_version)s",
             "check_uptake": True,
-            "paths": {
-                "linux": {
-                    "path": "/thunderbird/releases/%(version)s/update/linux-i686/:lang/thunderbird-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux",
-                },
-                "linux64": {
-                    "path": "/thunderbird/releases/%(version)s/update/linux-x86_64/:lang/thunderbird-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "linux64",
-                },
-                "macosx64": {
-                    "path": "/thunderbird/releases/%(version)s/update/mac/:lang/thunderbird-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "osx",
-                },
-                "win32": {
-                    "path": "/thunderbird/releases/%(version)s/update/win32/:lang/thunderbird-%(prev_version)s-%(version)s.partial.mar",
-                    "bouncer-platform": "win",
-                },
-            },
+            "platforms": [
+                "linux",
+                "linux64",
+                "osx",
+                "win",
+            ],
         },
     },
 }
--- a/testing/mozharness/scripts/release/bouncer_check.py
+++ b/testing/mozharness/scripts/release/bouncer_check.py
@@ -131,35 +131,33 @@ class BouncerCheck(BaseScript, Virtualen
 
         retry(do_check_url, sleeptime=3, max_sleeptime=10, attempts=3)
 
     def get_urls(self):
         for product in self.config["products"].values():
             if not product["check_uptake"]:
                 continue
             product_name = product["product-name"] % {"version": self.config["version"]}
-            for path in product["paths"].values():
-                bouncer_platform = path["bouncer-platform"]
+            for bouncer_platform in product["platforms"]:
                 for locale in self.config["locales"]:
                     url = BOUNCER_URL_PATTERN.format(
                         bouncer_prefix=self.config["bouncer_prefix"],
                         product=product_name,
                         os=bouncer_platform,
                         lang=locale,
                     )
                     yield url
 
         for product in self.config.get("partials", {}).values():
             if not product["check_uptake"]:
                 continue
             for prev_version in self.config.get("prev_versions", []):
                 product_name = product["product-name"] % {"version": self.config["version"],
                                                           "prev_version": prev_version}
-                for path in product["paths"].values():
-                    bouncer_platform = path["bouncer-platform"]
+                for bouner_platform in product["platforms"]:
                     for locale in self.config["locales"]:
                         url = BOUNCER_URL_PATTERN.format(
                             bouncer_prefix=self.config["bouncer_prefix"],
                             product=product_name,
                             os=bouncer_platform,
                             lang=locale,
                         )
                         yield url