Merge pull request #277 from nextcloud/update-docker-container

Update docker container

Author: AndyScherzinger

.drone.yml

@@ -1,9 +1,9 @@
 pipeline:
   test:
-    image: nextcloudci/android:android-2
+    image: nextcloudci/android:android-7
     commands:
       - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI -c 20M
-      - emulator -avd test -no-skin -no-audio -no-window &
+      - emulator -avd test -no-window &
       - ./wait_for_emulator.sh
       # build app and assemble APK, in debug mode
       - ./gradlew assembleDebug
@@ -19,6 +19,6 @@ pipeline:
       #- adb shell am instrument -w -e debug false -e class com.owncloud.android.datamodel.OCFileUnitTest com.owncloud.android.test/android.support.test.runner.AndroidJUnitRunner
 
     environment:
-      - ANDROID_TARGET=android-23
+      - ANDROID_TARGET=android-24
       - ANDROID_ABI=armeabi-v7a
       - LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu/:/opt/android-sdk-linux/tools/lib64/gles_mesa/

wait_for_emulator.sh

@@ -1,19 +1,24 @@
 #!/bin/bash
 
+# Originally written by Ralf Kistner <ralf@embarkmobile.com>, but placed in the public domain
+
 bootanim=""
 failcounter=0
 checkcounter=0
+
 until [[ "$bootanim" =~ "stopped" ]]; do
    bootanim=`adb -e shell getprop init.svc.bootanim 2>&1`
    echo "($checkcounter) $bootanim"
    if [[ "$bootanim" =~ "not found" ]]; then
       let "failcounter += 1"
-      if [[ $failcounter -gt 30 ]]; then
+      if [[ $failcounter -gt 3 ]]; then
         echo "Failed to start emulator"
         exit 1
       fi
    fi
    let "checkcounter += 1"
    sleep 10
 done
-echo "Done"
+echo "($checkcounter) Done"
+adb -e shell input keyevent 82
+echo "($checkcounter) Unlocked emulator screen"