Skip to content

Commit 4ff1179

Browse files
authored
Fix linux download test failures (mozilla#16858)
* Cross-port ESR 115 exception from Springfield * chore: disable references to 32-bit linux - no longer available A proper cleanup is needed after this, ideally removing all the DL pages from bedrock anyway * Back out some removals of linux32-bit to keep tests happy; code is dead and needs cutting
1 parent 69d6856 commit 4ff1179

File tree

4 files changed

+10
-4
lines changed

4 files changed

+10
-4
lines changed

‎bedrock/firefox/firefox_details.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ def platforms(self, channel="release", classified=False):
8686
else:
8787
platforms = self.platform_labels.copy()
8888

89-
# Linux ARM64/AArch64 installers not available for ESR builds.
90-
if channel == "esr":
91-
del platforms["linux64-aarch64"]
89+
# Support for linux32 "i686" platform ends with v145 (see issue mozmeao/springfield#466)
90+
if self.latest_major_version(channel) >= 145:
91+
del platforms["linux"]
9292

9393
return list(platforms.items())
9494

‎bedrock/firefox/templates/firefox/includes/macros.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,14 @@
7474
{% macro firefox_download_desktop_button_linux(cta_copy=ftl('download-button-download-now'), id='download-button-desktop-release-linux', position='primary cta') -%}
7575
<div class="firefox-platform-button-linux">
7676
<div class="firefox-platform-button">
77+
78+
{% comment %}
7779
<a class="download-link os_linux mzp-t-xl mzp-c-button mzp-t-product ga-product-download" id="{{ id }}" href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux&lang={{ LANG }}" data-download-version="linux" data-cta-text="Download for Linux 32-bit" data-cta-position="{{ position }}" data-testid="{{ id }}">
7880
<strong class="download-title">
7981
{{ ftl('download-button-linux-32-v2') }}
8082
</strong>
8183
</a>
84+
{% endcomment %}
8285

8386
<a class="download-link os_linux64 mzp-t-xl mzp-c-button mzp-t-product ga-product-download" id="{{ id }}-64" href="{{ settings.BOUNCER_URL }}?product=firefox-latest-ssl&os=linux64&lang={{ LANG }}" data-download-version="linux64" data-cta-text="Download for Linux 64-bit" data-cta-position="{{ position }}" data-testid="{{ id }}-64">
8487
<strong class="download-title">

‎bedrock/firefox/tests/test_firefox_all.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def test_all_step_1(client):
7171
"product_slug, name, count",
7272
(
7373
("desktop-release", "Firefox", 10),
74-
("desktop-esr", "Firefox Extended Support Release", 8),
74+
("desktop-esr", "Firefox Extended Support Release", 9),
7575
("desktop-beta", "Firefox Beta", 10),
7676
("desktop-developer", "Firefox Developer Edition", 9),
7777
("desktop-nightly", "Firefox Nightly", 9),

‎bedrock/firefox/views.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,9 @@ class MobileRelease:
343343
# ESR115 builds do not exist for "sat" ans "skr" languages (see issue #15437).
344344
if locale in ["sat", "skr"]:
345345
download_esr_115_url = None
346+
# ESR115 builds do not exist for "linux64-aarch64" platform (see issue mozmeao/springfield#467)
347+
if platform == "linux64-aarch64":
348+
download_esr_115_url = None
346349
context.update(
347350
download_esr_115_url=download_esr_115_url,
348351
)

0 commit comments

Comments
 (0)