Uninstall test orchestrator and test services before starting the tests

rubensousa · Sep 25, 2024 · 3e6044b · 3e6044b
1 parent 9feb48c
commit 3e6044b
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -116,7 +116,7 @@ jobs:
           ram-size: 4096M
           emulator-options: -no-window -no-snapshot-save -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           script: |
-            ./gradlew uninstallAll
+            ./scripts/uninstall_test_services.sh
             adb shell settings put global verifier_verify_adb_installs 0
             ./gradlew --build-cache dpadrecyclerview-compose:connectedDebugAndroidTest
             ./gradlew --build-cache sample:connectedDebugAndroidTest

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -112,7 +112,7 @@ jobs:
           ram-size: 4096M
           emulator-options: -no-window -no-snapshot-save -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
           script: |
-            ./scripts/install_test_apks.sh
+            ./scripts/uninstall_test_services.sh
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v3

diff --git a/artifacts/orchestrator-1.4.2.apk b/artifacts/orchestrator-1.4.2.apk
diff --git a/artifacts/test-services-1.4.2.apk b/artifacts/test-services-1.4.2.apk
diff --git a/scripts/install_test_apks.sh b/scripts/install_test_apks.sh
diff --git a/scripts/uninstall_test_services.sh b/scripts/uninstall_test_services.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+adb uninstall androidx.test.orchestrator 2> /dev/null
+adb uninstall androidx.test.services 2> /dev/null
+./gradlew uninstalAll || exit 1
+exit 0