diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 91ee6c3d11c214b406e5ccb723c5dc2cdc9948ac..5cca60518d11713828a2342f89bbdd58593bcae2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,42 +56,42 @@ unit_test: script: - ./gradlew test -#ui_test: -# image: "0xacab.org:4567/leap/bitmask_android/android-emulator:latest" -# stage: test -# script: -# - emulator -avd testApi27 -no-audio -no-window & -# - .gitlab/wait-for-emulator.sh -# - adb devices -# - adb shell settings put global window_animation_scale 0 & -# - adb shell settings put global transition_animation_scale 0 & -# - adb shell settings put global animator_duration_scale 0 & -# - adb shell input keyevent 82 & -# - ./gradlew connectedAndroidTest -# - adb -s testApi27 emu kill +ui_test: + image: "0xacab.org:4567/leap/bitmask_android/android-emulator:latest" + stage: test + script: + - $ANDROID_HOME/emulator/emulator64-x86 -avd testApi27 -no-audio -no-window & + - .gitlab/wait-for-emulator.sh + - adb devices + - adb shell settings put global window_animation_scale 0 & + - adb shell settings put global transition_animation_scale 0 & + - adb shell settings put global animator_duration_scale 0 & + - adb shell input keyevent 82 & + - ./gradlew connectedAndroidTest + - adb -s testApi27 emu kill -#expanded_test: -# image: "0xacab.org:4567/leap/bitmask_android/android-emulator:latest" -# stage: test -# script: -# - emulator -avd testApi27 -no-audio -no-window & -# - .gitlab/wait-for-emulator.sh -# - adb devices -# - adb shell settings put global window_animation_scale 0 & -# - adb shell settings put global transition_animation_scale 0 & -# - adb shell settings put global animator_duration_scale 0 & -# - adb shell input keyevent 82 & -# - ./gradlew connectedAndroidTest -# - ./gradlew createProductionDebugCoverageReport -# - adb -s testApi27 emu kill -# - ./gradlew test -# artifacts: -# expire_in: 3 days -# paths: -# - app/build/reports/androidTests/connected/ -# - app/build/reports/coverage/production/ -# - app/build/tests/ -# when: manual +expanded_test: + image: "0xacab.org:4567/leap/bitmask_android/android-emulator:latest" + stage: test + script: + - $ANDROID_HOME/emulator/emulator64-x86 -avd testApi27 -no-audio -no-window & + - .gitlab/wait-for-emulator.sh + - adb devices + - adb shell settings put global window_animation_scale 0 & + - adb shell settings put global transition_animation_scale 0 & + - adb shell settings put global animator_duration_scale 0 & + - adb shell input keyevent 82 & + - ./gradlew connectedAndroidTest + - ./gradlew createProductionDebugCoverageReport + - adb -s testApi27 emu kill + - ./gradlew test + artifacts: + expire_in: 3 days + paths: + - app/build/reports/androidTests/connected/ + - app/build/reports/coverage/production/ + - app/build/tests/ + when: manual build: image: "0xacab.org:4567/leap/bitmask_android/android-ndk:latest" diff --git a/docker/android-emulator/Dockerfile b/docker/android-emulator/Dockerfile index 971507997b2876f8f74f209e15e2f0d3ca5ab61c..2d38d8e36c946dfc000d651eabf5c65f3c232b41 100644 --- a/docker/android-emulator/Dockerfile +++ b/docker/android-emulator/Dockerfile @@ -18,7 +18,7 @@ RUN apt-get update -qq && \ RUN echo 'deb https://apt.dockerproject.org/repo debian-stretch main'> /etc/apt/sources.list.d/docker.list && \ curl -s https://apt.dockerproject.org/gpg | apt-key add - RUN apt-get update -qq && \ - apt-get -y install docker-engine mesa-utils && \ + apt-get -y install docker-engine mesa-utils libqt5widgets5 && \ apt-get clean && \ apt-get autoclean && \ rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*