From 00b06ee381419f232f7844651f4a9cfa5dac9120 Mon Sep 17 00:00:00 2001
From: Joris Bodin <joris.bodin@infomaniak.com>
Date: Wed, 28 Feb 2024 12:34:16 +0100
Subject: [PATCH] WIP

---
 .github/workflows/android.yml | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 267e390401..fcdd854de4 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,10 +13,10 @@ jobs:
 
   instrumentation-tests:
     if: github.event.pull_request.draft == false
-    runs-on: [ self-hosted, Android ]
+    runs-on: [ self-hosted, test ]
     strategy:
       matrix:
-        api-level: [ 31 ]
+        api-level: [ 34 ]
         target: [ google_apis ]
 
     env:
@@ -42,21 +42,6 @@ jobs:
           token: ${{ secrets.MY_REPO_PAT }}
           submodules: recursive
 
-      - name: create AVD and generate snapshot for caching
-        if: steps.avd-cache.outputs.cache-hit != 'true'
-        uses: reactivecircus/android-emulator-runner@v2.27.0
-        with:
-          api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
-          profile: Pixel 4
-          arch: x86_64
-          disk-size: 6G
-          avd-name: kdrive-test
-          force-avd-creation: false
-          disable-animations: false
-          emulator-options: -no-snapshot-save -noaudio -no-boot-anim -camera-back none -skin 540x1110
-          script: echo "Generated AVD snapshot for caching."
-
       - name: Create test env
         run: |
           touch $ENV_PATH
@@ -72,16 +57,18 @@ jobs:
         run: ./gradlew testDebugUnitTest --stacktrace
 
       - name: Run instrumentation tests
-        uses: ReactiveCircus/android-emulator-runner@v2.27.0
+        uses: ReactiveCircus/android-emulator-runner@v2.30.1
         with:
           api-level: ${{ matrix.api-level }}
           target: ${{ matrix.target }}
-          profile: Pixel 4
-          arch: x86_64
+          profile: pixel_7
+          arch: arm64-v8a
           disk-size: 6G
           avd-name: kdrive-test
           force-avd-creation: false
           disable-animations: true
+          env:
+            ANDROID_EMULATOR_WAIT_TIME_BEFORE_KILL: 16
           emulator-options: -no-snapshot-save -noaudio -no-boot-anim -camera-back none -skin 540x1110
           # emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none -skin 540x1110
           script: ./gradlew uninstallAll app:connectedStandardDebugAndroidTest --stacktrace