Run Android Instrumentation Tests as part of PR workflow (#2309)

.github/workflows/android-device-test.yml

@@ -10,7 +10,6 @@ jobs:
   android-device-test:
     strategy:
       fail-fast: false
-      max-parallel: 2
       matrix:
         test: [
           {
@@ -32,6 +31,15 @@ jobs:
             # benchmark-android.yaml
             # see https://github.com/maplibre/ci-runners/tree/main/aws-device-farm/custom-test-envs
             testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/14862afb-cf88-44aa-9f1e-5131cbb22f01"
+          },
+          {
+            artifactName: android-ui-test,
+            testFile: InstrumentationTests.apk,
+            appFile: InstrumentationTestApp.apk,
+            name: "Android Instrumentation Tests",
+            # Google Pixel 7 Pro
+            devicePool: "arn:aws:devicefarm:us-west-2:373521797162:devicepool:20687d72-0e46-403e-8f03-0941850665bc/9692fe7f-86a9-4ecc-908f-175600968564",
+            testSpecArn: "arn:aws:devicefarm:us-west-2:373521797162:upload:20687d72-0e46-403e-8f03-0941850665bc/09e0738e-c91e-4c5f-81e6-06a06cc340d8"
           }
         ]
     runs-on: ubuntu-latest
@@ -76,7 +84,7 @@ jobs:
           echo "run_device_test=true" >> "$GITHUB_ENV"
 
       - uses: LouisBrunner/checks-action@v2.0.0
-        if: env.run_device_test == 'true' || matrix.test.name == 'Android Render Tests'
+        if: env.run_device_test == 'true'
         id: create_check
         with:
           token: ${{ steps.generate_token.outputs.token }}
@@ -102,8 +110,8 @@ jobs:
           role-duration-seconds: 21600
           role-session-name: MySessionName
 
-      - name: Upload external data for benchmark
-        if: env.run_device_test == 'true' && matrix.test.name == 'Android Benchmark'
+      - name: Upload external data
+        if: env.run_device_test == 'true'
         run: |
           export RESULTS_API=${{ secrets.MLN_RESULTS_API }}
           export AWS_DEVICE_FARM_PROJECT_ARN=${{ vars.AWS_DEVICE_FARM_PROJECT_ARN }}