diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 07a4d658f..d862e3dea 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -17,8 +17,7 @@ before_script: - export PATH="$ANDROID_HOME/platform-tools:$PATH" - export PATH="$ANDROID_HOME/build-tools/23.0.1:$PATH" - echo " == Installing Android emulator images" - - echo y | android -s update sdk --no-ui -a -t android-10,android-19 - - echo y | android -s update sdk --no-ui -a -t sys-img-armeabi-v7a-android-19 + - echo y | android -s update sdk --no-ui -a -t android-10 - echo " == Installing Gradle" - wget -q -O gradle.zip https://services.gradle.org/distributions/gradle-2.4-bin.zip - unzip -q gradle.zip @@ -38,14 +37,3 @@ test: - ADB_INSTALL_TIMEOUT=8 gradle connectedCheck || { adb logcat -d '*:W'; exit 1; } - echo " == Stopping Android 2.3.7 emulator" - kill $! - - echo " == Creating Android 4.4.4 emulator" - - echo no | android create avd --force -n fcl-test -t android-19 -b armeabi-v7a - - echo " == Starting Android 4.4.4 emulator" - - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window & - - ./F-Droid/tools/wait-for-emulator - - adb shell input keyevent 82 - - sleep 60 # 4.4 says it's ready before it actually is - - echo " == Running Android tests on the 4.4.4 emulator" - - ADB_INSTALL_TIMEOUT=8 gradle connectedCheck || { adb logcat -d '*:W'; exit 1; } - - echo " == Stopping Android 4.4.4 emulator" - - kill $!