From ccdf35e07a879dc2d6921cc6f82055193322cec9 Mon Sep 17 00:00:00 2001 From: "Ben Hearsum (he/him)" Date: Fri, 13 Dec 2024 11:54:46 -0500 Subject: [PATCH] bustage fix: revert #1586 (#1590) It looks like this broke in prod for DevEdition :( https://mozilla.sentry.io/issues/6138643868/?alert_rule_id=14011861&alert_type=issue¬ification_uuid=26c35ba9-1f19-46fc-98b1-28e22632153a&project=6262522&referrer=slack ``` ClickException: Too few firefox primary builds for FIREFOX_DEVEDITION File "aioamqp/protocol.py", line 312, in run await self.dispatch_frame() File "aioamqp/protocol.py", line 268, in dispatch_frame await channel.dispatch_frame(frame) File "aioamqp/channel.py", line 114, in dispatch_frame await methods[frame.name](frame) File "aioamqp/channel.py", line 546, in basic_deliver await callback(self, body, envelope, properties) File "/app/src/src/shipit_api/admin/worker.py", line 27, in rebuild_product_details_async await rebuild(flask.current_app.db.session, app_channel, git_repo_url, folder_in_repo, breakpoint_version) File "/app/src/src/shipit_api/admin/product_details.py", line 1266, in rebuild sanity_checks(product_details) File "/app/src/src/shipit_api/admin/product_details.py", line 1091, in sanity_checks sanity_check_firefox_builds( File "/app/src/src/shipit_api/admin/product_details.py", line 1063, in sanity_check_firefox_builds raise click.ClickException(f"Too few firefox primary builds for {version_key}") ``` --- api/src/shipit_api/admin/product_details.py | 23 ++++++--------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/api/src/shipit_api/admin/product_details.py b/api/src/shipit_api/admin/product_details.py index de6ac4c95..bf4586789 100644 --- a/api/src/shipit_api/admin/product_details.py +++ b/api/src/shipit_api/admin/product_details.py @@ -211,19 +211,11 @@ async def fetch_l10n_data( session: aiohttp.ClientSession, release: shipit_api.common.models.Release, raise_on_failure: bool, use_cache: bool = True ) -> typing.Tuple[shipit_api.common.models.Release, typing.Optional[ReleaseL10ns]]: # Fenix and some thunderbird on the betas don't have l10n in the repository - # XXX: for some reason we didn't generate l10n for devedition in old_product_details if ( Product(release.product) is Product.THUNDERBIRD and release.branch == "releases/comm-beta" and release.revision in ["3e01e0dc6943", "481fea2011e6", "85cb8f907b18", "92950b2fd2dc", "c614b6e7cf58", "e277e3f0ab13", "efd290b55a35", "f87ba53e04ff"] - ) or Product(release.product) in ( - Product.FENIX, - Product.ANDROID_COMPONENTS, - Product.FOCUS_ANDROID, - Product.FIREFOX_ANDROID, - Product.APP_SERVICES, - Product.DEVEDITION, - ): + ) or Product(release.product) in (Product.FENIX, Product.ANDROID_COMPONENTS, Product.FOCUS_ANDROID, Product.FIREFOX_ANDROID, Product.APP_SERVICES): return (release, None) url_file = { @@ -612,12 +604,7 @@ async def get_primary_builds( if Product(release.product) not in products or release.version not in versions: continue # Make sure to add en-US, it's not listed in the l10n changesets file - locales = ["en-US"] - if release in releases_l10n: - locales += releases_l10n[release].keys() - elif f"1.0/l10n/{release.name}.json" in old_product_details: - locales += old_product_details[f"1.0/l10n/{release.name}.json"]["locales"] - for l10n in locales: + for l10n in list(releases_l10n.get(release, {}).keys()) + ["en-US"]: # for compatibility with shipit v1, skip ja-JP-mac if l10n == "ja-JP-mac": continue @@ -847,6 +834,9 @@ def get_l10n( data: ProductDetails = {file_.replace("1.0/", ""): content for file_, content in old_product_details.items() if file_.startswith("1.0/l10n/")} for release, locales in releases_l10n.items(): + # XXX: for some reason we didn't generate l10n for devedition in old_product_details + if Product(release.product) is Product.DEVEDITION: + continue data[f"l10n/{release.name}.json"] = { "locales": {locale: dict(changeset=content["revision"]) for locale, content in locales.items()}, "submittedAt": with_default(release.created, to_isoformat, default=""), @@ -1192,9 +1182,8 @@ async def rebuild( logger.info("Getting locales from hg.mozilla.org for each release from database") # use limit_per_host=50 since hg.mozilla.org doesn't like too many connections async with aiohttp.ClientSession(connector=aiohttp.TCPConnector(limit_per_host=50), timeout=aiohttp.ClientTimeout(total=30)) as session: - missing_releases = [release for release in releases if f"1.0/l10n/{release.name}.json" not in old_product_details] raise_on_failure = git_branch in ["production", "staging"] - releases_l10n = await asyncio.gather(*[fetch_l10n_data(session, release, raise_on_failure) for release in missing_releases]) + releases_l10n = await asyncio.gather(*[fetch_l10n_data(session, release, raise_on_failure) for release in releases]) nightly_l10n = await asyncio.gather(*[fetch_l10n_data(session, release, raise_on_failure) for release in nightly_builds]) releases_l10n = {release: changeset for (release, changeset) in releases_l10n if changeset is not None}