Update .gitlab-ci.yml

.gitlab-ci.yml

@@ -1,69 +1,60 @@
 image: jangrewe/gitlab-ci-android
- 
+
 stages:
   - build
   - test
- 
+
 before_script:
 - export GRADLE_USER_HOME=$(pwd)/.gradle
 - chmod +x ./gradlew
- 
+
-build_debug:
+cache:
+  key: ${CI_PROJECT_ID}
+  paths:
+  - .gradle/
+
+build_dev_debug:
   stage: build
   script:
-    - ./gradlew assembleDebug
+    - ./gradlew assembleDevDebug
+    - ./gradlew assembleDevDebugAndroidTest
+  only:
+    - dev
   artifacts:
     paths:
       - app/build/outputs/
- 
+
-.test_lab_template: &test_lab_template_def
+instrumentation_test_dev_debug:
   stage: test
+  only:
+    - dev
   before_script:
     # Preparing wget
     - apt-get update
-    #- apt-get upgrade -y
+    - apt-get upgrade -y
     - apt install python2.7 python-pip -y
-    #- apt-get install wget
+    - apt-get install wget
- 
+
     # Install Google Cloud SDK
-    - curl https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz --output /tmp/google-cloud-sdk.tar.gz
+    - wget --quiet --output-document=/tmp/google-cloud-sdk.tar.gz https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.tar.gz
     - mkdir -p /opt
     - tar zxf /tmp/google-cloud-sdk.tar.gz --directory /opt
     - /opt/google-cloud-sdk/install.sh --quiet
     - source /opt/google-cloud-sdk/path.bash.inc
- 
+
     # Setup and configure the project
     - gcloud components update
-    - echo $GCLOUD_PROJECT_ID
+    - gcloud config set project $PROJECT_ID
-    - gcloud config set project $GCLOUD_PROJECT_ID
+
- 
     # Activate cloud credentials
     - echo $SERVICE_ACCOUNT > /tmp/service-account.json
     - gcloud auth activate-service-account --key-file /tmp/service-account.json
- 
+  script:
-    # List available options for logging purpose only (so that we can review available options)
+    # copy file to root and rename it for easier access
-    - gcloud firebase test android models list
+    - cp app/build/outputs/apk/dev/debug/app-dev-debug.apk ./app.apk
-    - gcloud firebase test android versions list
+    - cp app/build/outputs/apk/androidTest/dev/debug/app-dev-debug-androidTest.apk ./app-test.apk
- 
+
- 
+    # deploy to gcloud and run instrumented test
-  after_script:
+    - gcloud firebase test android run --type instrumentation --app app.apk --test app-test.apk --device model=Nexus6P,version=26,locale=en,orientation=portrait
-    - source /opt/google-cloud-sdk/path.bash.inc
+  dependencies:
- 
+    - build_dev_debug
-    # Iterate up to 10 possible test lab configurations and create CLI tool options
-    - for i in `seq 1 10`; do export CONFIG="TEST_LAB_DEVICE_CONFIGURATION_$i"; if [ -n "${!CONFIG}" ]; then export TEST_LAB_DEVICE_CONFIGURATIONS="$TEST_LAB_DEVICE_CONFIGURATIONS --device model=${!CONFIG} "; fi; done
- 
-    # Output for debug logging purpose only
-    - echo $TEST_LAB_DEVICE_CONFIGURATIONS
- 
-    # Run tests if there were any configured
-    - if [ -n "$TEST_LAB_DEVICE_CONFIGURATIONS" ]; then gcloud firebase test android run --type robo --app app.apk $TEST_LAB_DEVICE_CONFIGURATIONS --timeout 90s; fi
- 
-    # Warn if there were no configurations
-    - if [ -z "$TEST_LAB_DEVICE_CONFIGURATIONS" ]; then echo "NO FIREBASE TESTLAB CONFIGURATIONS!!!"; fi
- 
-test_lab_debug:
-    <<: *test_lab_template_def
-    script:
-        - cp app/build/outputs/apk/autopizza/debug/app-autopizza-debug.apk ./app.apk
-    dependencies:
-        - build_debug