From d131d25c1a13265d5b2c49a8581d6223c086e4fd Mon Sep 17 00:00:00 2001 From: AustinBenoit Date: Thu, 2 Jul 2026 16:03:41 -0400 Subject: [PATCH 1/3] Fix FTL Galaxy S25 Ultra (pa3q) Android version to 35 Firebase Test Lab only supports Android 35 for the Galaxy S25 Ultra (pa3q), not Android 36. Using version 36 caused FTL to decline/skip the test run with exit code 18 (Outcome: Skipped). Verified using: gcloud firebase test android models list --- scripts/gha/print_matrix_configuration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 0c99d2a421..0dca24d275 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -185,7 +185,7 @@ {"type": "ftl", "device": "model=rango,version=36"}, # Pixel 10 Pro Fold {"type": "ftl", "device": "model=tangorpro,version=33"}, # Pixel Tablet {"type": "ftl", "device": "model=gts9wifi,version=34"}, # Galaxy Tab S9 - {"type": "ftl", "device": "model=pa3q,version=36"}, # Galaxy S25 Ultra + {"type": "ftl", "device": "model=pa3q,version=35"}, # Galaxy S25 Ultra {"type": "ftl", "device": "model=b6q,version=34"}, # Galaxy Z Flip6 ], "emulator_ftl_target": [ From 673bb0fe833b55450d179d33977cb6278267d838 Mon Sep 17 00:00:00 2001 From: AustinBenoit Date: Thu, 2 Jul 2026 16:22:08 -0400 Subject: [PATCH 2/3] Update FTL emulator matrix to test API 26 and API 35 - Set emulator_ftl_target (baseline) to API 26 (oldest FTL emulator version) and removed the invalid non-ARM Pixel2 model. - Set emulator_ftl_latest (latest) to API 35 (Android 15) and removed Pixel2.arm since it only supports up to API 33. --- scripts/gha/print_matrix_configuration.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 0dca24d275..67040cb6d7 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -189,17 +189,15 @@ {"type": "ftl", "device": "model=b6q,version=34"}, # Galaxy Z Flip6 ], "emulator_ftl_target": [ - {"type": "ftl", "device": "model=Pixel2,version=28"}, - {"type": "ftl", "device": "model=Pixel2.arm,version=28"}, - {"type": "ftl", "device": "model=MediumPhone.arm,version=28"}, - {"type": "ftl", "device": "model=MediumTablet.arm,version=28"}, - {"type": "ftl", "device": "model=SmallPhone.arm,version=28"}, + {"type": "ftl", "device": "model=Pixel2.arm,version=26"}, + {"type": "ftl", "device": "model=MediumPhone.arm,version=26"}, + {"type": "ftl", "device": "model=MediumTablet.arm,version=26"}, + {"type": "ftl", "device": "model=SmallPhone.arm,version=26"}, ], "emulator_ftl_latest": [ - {"type": "ftl", "device": "model=Pixel2.arm,version=32"}, - {"type": "ftl", "device": "model=MediumPhone.arm,version=32"}, - {"type": "ftl", "device": "model=MediumTablet.arm,version=32"}, - {"type": "ftl", "device": "model=SmallPhone.arm,version=32"}, + {"type": "ftl", "device": "model=MediumPhone.arm,version=35"}, + {"type": "ftl", "device": "model=MediumTablet.arm,version=35"}, + {"type": "ftl", "device": "model=SmallPhone.arm,version=35"}, ], "emulator_target": [ {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"} ], "emulator_latest": [ {"type": "virtual", "image":"system-images;android-32;google_apis;x86_64"} ], From c186721284271bf7205fa5cfe49b5e509cff0390 Mon Sep 17 00:00:00 2001 From: AustinBenoit Date: Fri, 3 Jul 2026 08:25:27 -0400 Subject: [PATCH 3/3] Revert FTL emulator versions to 28/32, keeping Pixel2 (non-arm) removal Revert the target and latest emulator versions back to their original values of 28 and 32 respectively. Keep only the removal of the invalid/obsolete Pixel2 (non-arm) device from emulator_ftl_target. --- scripts/gha/print_matrix_configuration.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py index 67040cb6d7..1a63846acf 100644 --- a/scripts/gha/print_matrix_configuration.py +++ b/scripts/gha/print_matrix_configuration.py @@ -189,15 +189,16 @@ {"type": "ftl", "device": "model=b6q,version=34"}, # Galaxy Z Flip6 ], "emulator_ftl_target": [ - {"type": "ftl", "device": "model=Pixel2.arm,version=26"}, - {"type": "ftl", "device": "model=MediumPhone.arm,version=26"}, - {"type": "ftl", "device": "model=MediumTablet.arm,version=26"}, - {"type": "ftl", "device": "model=SmallPhone.arm,version=26"}, + {"type": "ftl", "device": "model=Pixel2.arm,version=28"}, + {"type": "ftl", "device": "model=MediumPhone.arm,version=28"}, + {"type": "ftl", "device": "model=MediumTablet.arm,version=28"}, + {"type": "ftl", "device": "model=SmallPhone.arm,version=28"}, ], "emulator_ftl_latest": [ - {"type": "ftl", "device": "model=MediumPhone.arm,version=35"}, - {"type": "ftl", "device": "model=MediumTablet.arm,version=35"}, - {"type": "ftl", "device": "model=SmallPhone.arm,version=35"}, + {"type": "ftl", "device": "model=Pixel2.arm,version=32"}, + {"type": "ftl", "device": "model=MediumPhone.arm,version=32"}, + {"type": "ftl", "device": "model=MediumTablet.arm,version=32"}, + {"type": "ftl", "device": "model=SmallPhone.arm,version=32"}, ], "emulator_target": [ {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"} ], "emulator_latest": [ {"type": "virtual", "image":"system-images;android-32;google_apis;x86_64"} ],