Merge branch 'testando-manolo' into 'master'

Testando manolo

See merge request !1

.gitlab-ci.yml

-image: openjdk:8-jdk
-
 variables:
   ANDROID_COMPILE_SDK: "25"
   ANDROID_BUILD_TOOLS: "25.0.3"
@@ -7,29 +5,27 @@ variables:
   ANDROID_CMAKE_REV: "3.6.3155560"
 
 before_script:
-  - mkdir $HOME/.android # For sdkmanager configs
-  - echo 'count=0' > $HOME/.android/repositories.cfg # Avoid warning
-  - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOLS_REV}.zip
-  - mkdir $PWD/android-sdk-linux
-  - unzip -qq android-sdk.zip -d $PWD/android-sdk-linux
-  - export ANDROID_HOME=$PWD/android-sdk-linux
-  - export PATH=$PATH:$ANDROID_HOME/platform-tools/:$ANDROID_NDK_HOME
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager --update
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'tools'
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'platform-tools'
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'build-tools;'$ANDROID_BUILD_TOOLS
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'platforms;android-'$ANDROID_COMPILE_SDK
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'extras;android;m2repository'
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'extras;google;google_play_services'
-  - echo yes | $ANDROID_HOME/tools/bin/sdkmanager 'extras;google;m2repository'
   - chmod +x ./gradlew
 
-
 stages:
+  - build_image
   - build
   - test
 
+buildImage:
+  tags:
+    - android
+  only:
+    - master
+  stage: build_image
+  script:
+    - docker run -it -v $(pwd)/sdk:/opt/android-sdk thyrlian/android-sdk /bin/bash
+
 build:
+  tags:
+    - android
+  only:
+    - master
   stage: build
   script:
     - ./gradlew assembleDebug
@@ -37,19 +33,18 @@ build:
     paths:
     - app/build/outputs/
 
-unitTests:
-  stage: test
-  script:
-    - ./gradlew test
-
 functionalTests:
+  tags:
+    - android
+  only:
+    - master
   stage: test
   script:
     - wget --quiet --output-document=android-wait-for-emulator https://raw.githubusercontent.com/travis-ci/travis-cookbooks/0f497eb71291b52a703143c5cd63a217c8766dc9/community-cookbooks/android-sdk/files/default/android-wait-for-emulator
     - chmod +x android-wait-for-emulator
-    - echo y | android-sdk-linux/tools/android --silent update sdk --no-ui --all --filter sys-img-x86-google_apis-${ANDROID_COMPILE_SDK}
-    - echo no | android-sdk-linux/tools/android create avd -n test -t android-${ANDROID_COMPILE_SDK} --abi google_apis/x86
-    - android-sdk-linux/tools/emulator64-x86 -avd test -no-window -no-audio &
+    - echo y | $ANDROID_HOME/tools/bin/avdmanager --silent update sdk --no-ui --all --filter sys-img-x86-google_apis-${ANDROID_COMPILE_SDK}
+    - echo no | $ANDROID_HOME/tools/bin/avdmanager create avd -n test -t android-${ANDROID_COMPILE_SDK} --abi google_apis/x86
+    - $ANDROID_HOME/tools/bin/avdmanager/emulator64-x86 -avd test -no-window -no-audio &
     - ./android-wait-for-emulator
     - adb shell input keyevent 82
     - ./gradlew cAT