From a22a22d8fffb312b0d6dfdf545ff6fe6f05dbcee Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jan 2018 16:10:15 +0100 Subject: #8818 test NavigationDrawer with espresso test and update sdk therefore --- docker/android-emulator/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'docker/android-emulator/Dockerfile') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index bececd08..cc9e0750 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -31,7 +31,6 @@ RUN apt-get update -qq && \ RUN echo y | sdkmanager "emulator" # Install System Images for emulators -RUN echo y | sdkmanager "system-images;android-26;google_apis;x86" +RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" -RUN echo y | sdkmanager "system-images;android-24;google_apis;x86_64" RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" -- cgit v1.2.3 From a82e9f9290114e1d41ddf36797e1cdb764a6a758 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jan 2018 19:35:48 +0100 Subject: #8818 continuous integration for ui tests --- docker/android-emulator/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docker/android-emulator/Dockerfile') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index cc9e0750..161b5ae4 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -34,3 +34,5 @@ RUN echo y | sdkmanager "emulator" RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" + +RUN avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file -- cgit v1.2.3 From 033e2d25f1ce1ff4ec64fb5e80d7feb918f868dd Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 29 Jan 2018 21:00:52 +0100 Subject: #8818 fix emulator setup command --- docker/android-emulator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docker/android-emulator/Dockerfile') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 161b5ae4..3ea9e311 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -35,4 +35,4 @@ RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" -RUN avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file +RUN echo no | avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file -- cgit v1.2.3 From a43778e930041ab26e4d70348553fb98c3f6872d Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 30 Jan 2018 13:00:32 +0100 Subject: #8818 add abi option to emulator setup --- docker/android-emulator/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docker/android-emulator/Dockerfile') diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 3ea9e311..97150799 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -1,7 +1,7 @@ FROM 0xacab.org:4567/leap/bitmask_android/android-sdk:latest MAINTAINER LEAP Encryption Access Project -LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="25" +LABEL Description="Android SDK baseimage based on debian:stretch" Vendor="LEAP" Version="26" # Make sure debconf doesn't complain about lack of interactivity ENV DEBIAN_FRONTEND noninteractive @@ -35,4 +35,4 @@ RUN echo y | sdkmanager "system-images;android-27;google_apis;x86" RUN echo y | sdkmanager "system-images;android-25;google_apis;x86_64" RUN echo y | sdkmanager "system-images;android-23;google_apis;x86_64" -RUN echo no | avdmanager create avd -n testApi27 -k "system-images;android-27;google_apis;x86" \ No newline at end of file +RUN echo no | avdmanager create avd --force --name testApi27 --abi google_apis/x86 --package 'system-images;android-27;google_apis;x86' \ No newline at end of file -- cgit v1.2.3