tags and update funcionalTest

.gitlab-ci.yml

@@ -7,16 +7,6 @@ variables:
   ANDROID_CMAKE_REV: "3.6.3155560"
 
 before_script:
-  - mkdir $HOME/.android # For sdkmanager configs
-  - echo 'count=0' > $HOME/.android/repositories.cfg # Avoid warning
-  - 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
 
 
@@ -25,6 +15,8 @@ stages:
   - test
 
 build:
+  tags:
+    - android
   stage: build
   script:
     - ./gradlew assembleDebug
@@ -33,17 +25,18 @@ build:
     - app/build/outputs/
 
 unitTests:
+  tags:
+    - android
   stage: test
   script:
     - ./gradlew test
 
 functionalTests:
+  tags:
+    - android
   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 &
     - ./android-wait-for-emulator
     - adb shell input keyevent 82