Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 18 insertions, 11 deletions

diff --git a/testing/performance/hooks_android_startup.py b/testing/performance/hooks_android_startup.py
index 706dff1c0a..4a7a1bbe1a 100644
--- a/testing/performance/hooks_android_startup.py
+++ b/testing/performance/hooks_android_startup.py
@@ -15,10 +15,12 @@ from mozperftest.system.android_startup import (
     KEY_DATETIME,
     KEY_NAME,
     KEY_PRODUCT,
+    MOZILLA_PRODUCTS,
 )
 from mozversioncontrol import get_repository_object
 
 HTTP_200_OKAY = 200
+MONO_REPO_MIGRATION_DAY = datetime(2024, 3, 18)
 
 
 def before_iterations(kw):
@@ -31,18 +33,23 @@ def before_iterations(kw):
     else:
         commit_info = subprocess.getoutput("hg log -l 1")
     commit_date = re.search(r"[Dd]ate:\s+([:\s\w]+)\s+", str(commit_info)).group(1)
-    download_date = (
-        datetime.strptime(commit_date, "%a %b %d %H:%M:%S %Y") - timedelta(days=1)
-    ).strftime(DATETIME_FORMAT)
-
-    nightly_url = BASE_URL_DICT[product].format(
-        date=download_date, architecture=architecture
+    download_date = datetime.strptime(commit_date, "%a %b %d %H:%M:%S %Y") - timedelta(
+        days=1
     )
-    filename = f"{product}_nightly_{architecture}.apk"
-    print("Fetching {}...".format(filename), end="", flush=True)
-    download_apk_as_date(nightly_url, download_date, filename)
-    print(f"Downloaded {product} for date: {download_date}")
-
+    pre_mono_repo = ""
+    if download_date < MONO_REPO_MIGRATION_DAY and product != "geckoview_example":
+        pre_mono_repo = "-pre-mono-repo"
+    download_date = download_date.strftime(DATETIME_FORMAT)
+    if product in MOZILLA_PRODUCTS:
+        nightly_url = BASE_URL_DICT[product + pre_mono_repo].format(
+            date=download_date, architecture=architecture
+        )
+        filename = f"{product}_nightly_{architecture}.apk"
+        print("Fetching {}...".format(filename), end="", flush=True)
+        download_apk_as_date(nightly_url, download_date, filename)
+        print(f"Downloaded {product} for date: {download_date}")
+    else:
+        filename = product + ".apk"
     kw["apk_metadata"] = {
         KEY_NAME: filename,
         KEY_DATETIME: download_date,