From e15299294d074257f4ba79bcabb77dfaff5bef0e Mon Sep 17 00:00:00 2001
From: Andres Sandoval <sandovalandres@google.com>
Date: Wed, 6 Mar 2024 14:40:19 -0800
Subject: [PATCH] Test run using matrix.device-config

---
 .github/workflows/Build.yaml | 54 ++++++------------------------------
 1 file changed, 8 insertions(+), 46 deletions(-)

diff --git a/.github/workflows/Build.yaml b/.github/workflows/Build.yaml
index c2177a699..10b7aa315 100644
--- a/.github/workflows/Build.yaml
+++ b/.github/workflows/Build.yaml
@@ -139,52 +139,15 @@ jobs:
       - name: Check badging
         run: ./gradlew :app:checkProdReleaseBadging
 
-  #  androidTest:
-  #    runs-on: macOS-latest # enables hardware acceleration in the virtual machine
-  #    timeout-minutes: 55
-  #    strategy:
-  #      matrix:
-  #        api-level: [26, 30]
-  #
-  #    steps:
-  #      - name: Checkout
-  #        uses: actions/checkout@v4
-  #
-  #      - name: Copy CI gradle.properties
-  #        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-  #
-  #      - name: Set up JDK 17
-  #        uses: actions/setup-java@v4
-  #        with:
-  #          distribution: 'zulu'
-  #          java-version: 17
-  #
-  #      - name: Setup Gradle
-  #        uses: gradle/gradle-build-action@v2
-  #
-  #      - name: Build projects before running emulator
-  #        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest
-  #
-  #      - name: Run instrumentation tests
-  #        uses: reactivecircus/android-emulator-runner@v2
-  #        with:
-  #          api-level: ${{ matrix.api-level }}
-  #          arch: x86_64
-  #          disable-animations: true
-  #          disk-size: 6000M
-  #          heap-size: 600M
-  #          script: ./gradlew connectedDemoDebugAndroidTest --daemon
-  #
-  #      - name: Upload test reports
-  #        if: always()
-  #        uses: actions/upload-artifact@v4
-  #        with:
-  #          name: test-reports-${{ matrix.api-level }}
-  #          path: '**/build/reports/androidTests'
-
   androidTest-GMD:
-    runs-on: macOS-latest # enables hardware acceleration in the virtual machine
+    runs-on: ubuntu-latest
     timeout-minutes: 90
+    strategy:
+      matrix:
+        device-config: [ "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd",
+                         "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd",
+                         "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd",
+                         "pixel4api30aospatd","pixel6api31aosp","pixelCapi30aospatd" ]
 
     steps:
       - name: Delete unnecessary tools 🔧
@@ -205,7 +168,6 @@ jobs:
           sudo udevadm trigger --name-match=kvm
           ls /dev/kvm
 
-    steps:
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -228,7 +190,7 @@ jobs:
         run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest
 
       - name: Run instrumented tests with GMD
-        run: ./gradlew ciDemoDebugAndroidTest --no-parallel --max-workers=1
+        run: ./gradlew ${{matrix.device-config}}DemoDebugAndroidTest --no-parallel --max-workers=1
           -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
 
       - name: Upload test reports