chore(#337): fix e2e tests on CI (#348)

medic · Mar 11, 2024 · 5d7b775 · 5d7b775
1 parent 5e64289
commit 5d7b775
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -75,7 +75,7 @@ jobs:
   instrumentation-tests:
 
     name: Instrumentation tests
-    runs-on: macos-12
+    runs-on: ubuntu-22.04
     needs: skip_check
     if: ${{ needs.skip_check.outputs.should_skip != 'true' }}
     steps:
@@ -91,6 +91,12 @@ jobs:
         distribution: 'adopt'
         java-version: '11'
 
+    - name: Enable KVM
+      run: |
+        echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+        sudo udevadm control --reload-rules
+        sudo udevadm trigger --name-match=kvm
+
     - name: Gradle cache
       uses: actions/cache@v2
       with:
@@ -106,13 +112,14 @@ jobs:
         path: |
           ~/.android/avd/*
           ~/.android/adb*
-        key: avd-29-default
+        key: avd-33-default
 
     - name: Create AVD and generate snapshot for caching
       if: steps.avd-cache.outputs.cache-hit != 'true'
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
+        api-level: 33
+        arch: x86_64
         target: default
         force-avd-creation: false
         emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
@@ -125,7 +132,8 @@ jobs:
     - name: Run test-ui on unbranded
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
+        api-level: 33
+        arch: x86_64
         target: default
         force-avd-creation: false
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
@@ -134,7 +142,8 @@ jobs:
     - name: Run test-ui on gamma
       uses: reactivecircus/android-emulator-runner@v2
       with:
-        api-level: 29
+        api-level: 33
+        arch: x86_64
         target: default
         force-avd-creation: false
         emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none

diff --git a/build.gradle b/build.gradle
@@ -437,10 +437,10 @@ dependencies {
   testImplementation 'androidx.test.espresso:espresso-core:3.5.0-alpha05'
   testImplementation 'androidx.test.espresso:espresso-intents:3.5.0-alpha05'
   testImplementation 'androidx.test.ext:junit:1.1.3'
-  androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.0-alpha05'
-  androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-  androidTestImplementation 'androidx.test:runner:1.4.0'
-  androidTestImplementation 'androidx.test:rules:1.4.0'
-  androidTestImplementation 'androidx.test:core:1.4.0'
+  androidTestImplementation 'androidx.test.espresso:espresso-web:3.5.1'
+  androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+  androidTestImplementation 'androidx.test:runner:1.5.2'
+  androidTestImplementation 'androidx.test:rules:1.5.0'
+  androidTestImplementation 'androidx.test:core:1.5.0'
   androidTestImplementation 'org.hamcrest:hamcrest-library:2.2'
 }