Add more travis emulator tests.

.travis.yml

@@ -21,12 +21,14 @@ env:
     - COMPONENT=unit
     - COMPONENT=firebase
     - COMPONENT=instrumentation ANDROID_TARGET=16
+    - COMPONENT=instrumentation ANDROID_TARGET=17
+    - COMPONENT=instrumentation ANDROID_TARGET=18
+    - COMPONENT=instrumentation ANDROID_TARGET=19
+    - COMPONENT=instrumentation ANDROID_TARGET=20
+    - COMPONENT=instrumentation ANDROID_TARGET=21
     - COMPONENT=instrumentation ANDROID_TARGET=22
     - COMPONENT=samples
 
-before_script:
-  - ./scripts/travis_before_script.sh
-
 script:
   - ./scripts/travis_script.sh
 

scripts/travis_before_script.sh

-#!/usr/bin/env bash
-
-set -e
-
-if [ "$COMPONENT" == "instrumentation" ]; then
-  echo "Starting emulator for $COMPONENT tests"
-  ./scripts/travis_create_emulator.sh &
-
-fi
-

scripts/travis_instrumentation.sh

@@ -2,6 +2,14 @@
 
 set -e
 
+if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ $ANDROID_TARGET -gt 18 ]; then
+  echo "Emulator tests >= 19 are run on Firebase ignoring"
+  exit 0
+fi
+
+echo "Starting emulator for $COMPONENT tests"
+./scripts/travis_create_emulator.sh &
+
 ./gradlew :instrumentation:assembleDebug :instrumentation:assembleDebugAndroidTest --parallel
 
 echo "Waiting for emulator..."