From 9f9ee0fcc11f95ed36e01721d57e8308fdf1063e Mon Sep 17 00:00:00 2001
From: Carter Jernigan <git@carterjernigan.com>
Date: Thu, 9 Feb 2023 06:57:24 -0500
Subject: [PATCH] [#745] Use faster Firebase test lab devices

---
 .github/workflows/pull-request.yml | 2 +-
 app/build.gradle.kts               | 4 ++--
 build.gradle.kts                   | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index 49f32dcf..2f2a4142 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -294,7 +294,7 @@ jobs:
           # Because Fulladle doesn't allow Test Orchestrator to be enabled/disabled for a specific submodule, it must be enabled for all modules
           ORG_GRADLE_PROJECT_IS_USE_TEST_ORCHESTRATOR: true
         run: |
-          ./gradlew runFlank --parallel
+          ./gradlew runFlank
       - name: Collect Artifacts
         if: ${{ always() }}
         timeout-minutes: 1
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index f683c00f..41f958fe 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -298,7 +298,7 @@ fladle {
     // Firebase Test Lab has min and max values that might differ from our project's
     // These are determined by `gcloud firebase test android models list`
     @Suppress("MagicNumber", "PropertyName", "VariableNaming")
-    val FIREBASE_TEST_LAB_MIN_SDK = 23
+    val FIREBASE_TEST_LAB_MIN_SDK = 27 // Minimum for Pixel2.arm device
 
     @Suppress("MagicNumber", "PropertyName", "VariableNaming")
     val FIREBASE_TEST_LAB_MAX_SDK = 33
@@ -337,7 +337,7 @@ fladle {
             testTimeout.set("3m")
 
             devices.addAll(
-                mapOf("model" to "Pixel2", "version" to minSdkVersion),
+                mapOf("model" to "Pixel2.arm", "version" to minSdkVersion),
                 mapOf("model" to "Pixel2.arm", "version" to targetSdkVersion)
             )
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 4f0725c7..d966b6d8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -145,7 +145,7 @@ fladle {
     // Firebase Test Lab has min and max values that might differ from our project's
     // These are determined by `gcloud firebase test android models list`
     @Suppress("MagicNumber", "PropertyName", "VariableNaming")
-    val FIREBASE_TEST_LAB_MIN_SDK = 23
+    val FIREBASE_TEST_LAB_MIN_SDK = 27 // Minimum for Pixel2.arm device
 
     @Suppress("MagicNumber", "PropertyName", "VariableNaming")
     val FIREBASE_TEST_LAB_MAX_SDK = 33
@@ -171,7 +171,7 @@ fladle {
     }
 
     devices.addAll(
-        mapOf("model" to "Pixel2", "version" to minSdkVersion),
+        mapOf("model" to "Pixel2.arm", "version" to minSdkVersion),
         mapOf("model" to "Pixel2.arm", "version" to targetSdkVersion)
     )
 
@@ -187,8 +187,8 @@ fladle {
     flankVersion.set(libs.versions.flank.get())
 
     filesToDownload.set(listOf(
-        "*/matrix_*/*test_results_merged\\.xml",
-        "*/matrix_*/*/artifacts/sdcard/googletest/test_outputfiles/*\\.png"
+        ".*/matrix_.*/.*test_results_merged\\.xml",
+        ".*/matrix_.*/.*/artifacts/sdcard/googletest/test_outputfiles/.*\\.png"
     ))
 
     directoriesToPull.set(listOf(