testupstream/zmiao-circleci-test

3 files changed, 193 insertions, 171 deletions

diff --git a/circle.yml b/circle.yml
index f3bf4dd1c2..9464d7e6df 100644
--- a/circle.yml
+++ b/circle.yml
@@ -4,122 +4,122 @@ workflows:
   version: 2
   mbgl-next:
     jobs:
-      - next-sanity-checks
+      # - next-sanity-checks
       - next-android-render-test-runner
-      - next-build-template:
-          name: next-android-armeabi-v7a-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=armeabi-v7a'
-      - next-build-template:
-          name: next-android-arm64-v8a-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          requires:
-            - next-android-armeabi-v7a-release
-          config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a'
-      - next-build-template:
-          name: next-android-x86-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          requires:
-            - next-android-armeabi-v7a-release
-          config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
-      - next-build-template:
-          name: next-android-x86_64-release
-          executor_name: ubuntu-disco
-          target_is_android: true
-          requires:
-            - next-android-armeabi-v7a-release
-          config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64'
-      - next-build-template:
-          name: next-linux-gcc8-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'
-      - next-build-template:
-          name: next-linux-gcc4.9-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-linux-gcc8-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9'
-          build_params: '--target mbgl-glfw'
-          test_params: '-N -Q'
-      - next-build-template:
-          name: next-linux-gcc8-debug-coverage
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-linux-gcc8-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_BUILD_TYPE=DebugCoverage'
-      - next-build-template:
-          name: next-linux-clang8-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8'
-      - next-build-template:
-          name: next-FIXME-linux-asan
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-sanity-checks
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=address'
-          test_params: '|| true'
-      - next-build-template:
-          name: next-linux-tsan
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-sanity-checks
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=thread'
-      - next-build-template:
-          name: next-FIXME-linux-valgrind
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_CXX_FLAGS=-DSANITIZE'
-          test_params: '-j 4 -E "mbgl-node|gl-benchmark" -D ExperimentalMemCheck || true'
-      - next-build-template:
-          name: next-FIXME-linux-ubsan
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          requires:
-            - next-sanity-checks
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=undefined'
-          test_params: '|| true'
-      - next-build-template:
-          name: next-qt5-linux-gcc5-release
-          executor_name: ubuntu-disco
-          target_is_linux: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DMBGL_WITH_QT=ON'
-      - next-build-template:
-          name: next-qt5-macos-gcc5-release
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          requires:
-            - next-qt5-linux-gcc5-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)'
-          test_params: '-N -Q'
-      - next-build-template:
-          name: next-macos-xcode11-release
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
-      - next-build-template:
-          name: next-macos-xcode11-debug
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          requires:
-            - next-macos-xcode11-release
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug'
-      - next-build-template:
-          name: next-ios-xcode11-release
-          executor_name: macos-11_0_0
-          target_is_macos: true
-          config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator'
-          test_params: '-Q -N'
-  mbgl-legacy:
-    jobs:
+      # - next-build-template:
+      #     name: next-android-armeabi-v7a-release
+      #     executor_name: ubuntu-disco
+      #     target_is_android: true
+      #     config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=armeabi-v7a'
+      # - next-build-template:
+      #     name: next-android-arm64-v8a-release
+      #     executor_name: ubuntu-disco
+      #     target_is_android: true
+      #     requires:
+      #       - next-android-armeabi-v7a-release
+      #     config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=arm64-v8a'
+      # - next-build-template:
+      #     name: next-android-x86-release
+      #     executor_name: ubuntu-disco
+      #     target_is_android: true
+      #     requires:
+      #       - next-android-armeabi-v7a-release
+      #     config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86'
+      # - next-build-template:
+      #     name: next-android-x86_64-release
+      #     executor_name: ubuntu-disco
+      #     target_is_android: true
+      #     requires:
+      #       - next-android-armeabi-v7a-release
+      #     config_params: '-G Ninja -DCMAKE_TOOLCHAIN_FILE=/opt/android/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_CCACHE=/usr/bin/ccache -DANDROID_ABI=x86_64'
+      # - next-build-template:
+      #     name: next-linux-gcc8-release
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8'
+      # - next-build-template:
+      #     name: next-linux-gcc4.9-release
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     requires:
+      #       - next-linux-gcc8-release
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-4.9 -DCMAKE_CXX_COMPILER=g++-4.9'
+      #     build_params: '--target mbgl-glfw'
+      #     test_params: '-N -Q'
+      # - next-build-template:
+      #     name: next-linux-gcc8-debug-coverage
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     requires:
+      #       - next-linux-gcc8-release
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 -DCMAKE_BUILD_TYPE=DebugCoverage'
+      # - next-build-template:
+      #     name: next-linux-clang8-release
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8'
+      # - next-build-template:
+      #     name: next-FIXME-linux-asan
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     requires:
+      #       - next-sanity-checks
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=address'
+      #     test_params: '|| true'
+      # - next-build-template:
+      #     name: next-linux-tsan
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     requires:
+      #       - next-sanity-checks
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=thread'
+      # - next-build-template:
+      #     name: next-FIXME-linux-valgrind
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_CXX_FLAGS=-DSANITIZE'
+      #     test_params: '-j 4 -E "mbgl-node|gl-benchmark" -D ExperimentalMemCheck || true'
+      # - next-build-template:
+      #     name: next-FIXME-linux-ubsan
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     requires:
+      #       - next-sanity-checks
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=clang-8 -DCMAKE_CXX_COMPILER=clang++-8 -DCMAKE_BUILD_TYPE=Sanitize -DMBGL_WITH_SANITIZER=undefined'
+      #     test_params: '|| true'
+      # - next-build-template:
+      #     name: next-qt5-linux-gcc5-release
+      #     executor_name: ubuntu-disco
+      #     target_is_linux: true
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER=gcc-5 -DCMAKE_CXX_COMPILER=g++-5 -DMBGL_WITH_QT=ON'
+      # - next-build-template:
+      #     name: next-qt5-macos-gcc5-release
+      #     executor_name: macos-11_0_0
+      #     target_is_macos: true
+      #     requires:
+      #       - next-qt5-linux-gcc5-release
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMBGL_WITH_QT=ON -DCMAKE_PREFIX_PATH=$(echo /usr/local/Cellar/qt/5.*/lib/cmake)'
+      #     test_params: '-N -Q'
+      # - next-build-template:
+      #     name: next-macos-xcode11-release
+      #     executor_name: macos-11_0_0
+      #     target_is_macos: true
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache'
+      # - next-build-template:
+      #     name: next-macos-xcode11-debug
+      #     executor_name: macos-11_0_0
+      #     target_is_macos: true
+      #     requires:
+      #       - next-macos-xcode11-release
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_BUILD_TYPE=Debug'
+      # - next-build-template:
+      #     name: next-ios-xcode11-release
+      #     executor_name: macos-11_0_0
+      #     target_is_macos: true
+      #     config_params: '-G Ninja -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_SYSTEM_NAME=iOS -DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator'
+      #     test_params: '-Q -N'
+  # mbgl-legacy:
+  #   jobs:
       #
       # Naming convention: {platform}-{additional description}-{build type}
       #   - {platform} is the client platform/framework, which may differ from
@@ -128,59 +128,59 @@ workflows:
       #     unique aspect of the build environment.
       #   - {build type} is typically "debug" or "release".
       #
-      - android-debug-arm-v7-buck
-      - android-arm-template:
-          name: android-debug-arm-v8
-      - android-arm-template:
-          name: android-gnustl-arm-v7
-          stl: gnustl_shared
-          firebase_device_id: "flo"
-          firebase_device_os: "21"
-          image: android-ndk-r17c:1d5db0eb34
-          abi: arm-v7
-      - android-release:
-          filters:
-            tags:
-              only: /android-v.*/
-      - node-linux-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - node-macos-release:
-          filters:
-            tags:
-              only: /node-.*/
-      - linux-clang-7-sanitize-address-undefined
-      - linux-clang-7-sanitize-thread
-      - linux-gcc5-debug-coverage
-      - linux-doxygen
-      - ios-debug
-      - ios-debug-xcode10
-      - ios-release-template:
-          name: ios-release
-      - ios-release-tag:
-          filters:
-            tags:
-              only: /ios-.*/
-            branches:
-              ignore: /.*/
-      - macos-debug
-  nightly:
-    triggers:
-      - schedule:
-          cron: "0 5 * * *"
-          filters:
-            branches:
-              only:
-                - master
-    jobs:
-      - metrics-nightly
-      - ios-release-template:
-          name: ios-release-nightly
-      - ios-sanitize-nightly
-      - ios-sanitize-address-nightly
-      - ios-static-analyzer-nightly
-      - ios-static-analyzer-nightly-xcode10
+  #     - android-debug-arm-v7-buck
+  #     - android-arm-template:
+  #         name: android-debug-arm-v8
+  #     - android-arm-template:
+  #         name: android-gnustl-arm-v7
+  #         stl: gnustl_shared
+  #         firebase_device_id: "flo"
+  #         firebase_device_os: "21"
+  #         image: android-ndk-r17c:1d5db0eb34
+  #         abi: arm-v7
+  #     - android-release:
+  #         filters:
+  #           tags:
+  #             only: /android-v.*/
+  #     - node-linux-release:
+  #         filters:
+  #           tags:
+  #             only: /node-.*/
+  #     - node-macos-release:
+  #         filters:
+  #           tags:
+  #             only: /node-.*/
+  #     - linux-clang-7-sanitize-address-undefined
+  #     - linux-clang-7-sanitize-thread
+  #     - linux-gcc5-debug-coverage
+  #     - linux-doxygen
+  #     - ios-debug
+  #     - ios-debug-xcode10
+  #     - ios-release-template:
+  #         name: ios-release
+  #     - ios-release-tag:
+  #         filters:
+  #           tags:
+  #             only: /ios-.*/
+  #           branches:
+  #             ignore: /.*/
+  #     - macos-debug
+  # nightly:
+  #   triggers:
+  #     - schedule:
+  #         cron: "0 5 * * *"
+  #         filters:
+  #           branches:
+  #             only:
+  #               - master
+  #   jobs:
+  #     - metrics-nightly
+  #     - ios-release-template:
+  #         name: ios-release-nightly
+  #     - ios-sanitize-nightly
+  #     - ios-sanitize-address-nightly
+  #     - ios-static-analyzer-nightly
+  #     - ios-static-analyzer-nightly-xcode10
 
 executors:
   ubuntu-disco:
@@ -660,7 +660,7 @@ jobs:
           name: Build RenderTestRunner APK
           command: |
             cd render-test/android
-            ./gradlew --parallel --max-workers=8 -Pmapbox.abis=arm64-v8a app:assembleDebug app:assembleDebugAndroidTest
+            ./gradlew --parallel --max-workers=8 -Pmapbox.abis=arm64-v8a -PtestBuildType=release app:assembleRelease app:assembleAndroidTest
       - login-google-cloud-platform
       - run:
           name: Run RenderTestRunner Instrumentation Test on Firebase
@@ -669,8 +669,8 @@ jobs:
             if [[ -n "${GCLOUD_SERVICE_ACCOUNT_JSON}" && -z "${SKIP_FIREBASE:-}" ]]; then
               gcloud firebase test android models list
               gcloud firebase test android run --type instrumentation \
-                --app render-test/android/app/build/outputs/apk/debug/app-debug.apk \
-                --test render-test/android/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk \
+                --app render-test/android/app/build/outputs/apk/release/app-release.apk \
+                --test render-test/android/app/build/outputs/apk/androidTest/release/app-release-androidTest.apk \
                 --device-ids flame --os-version-ids 29 --locales en --orientations portrait --timeout 20m \
                 --directories-to-pull /sdcard --results-dir render-test-app-${CIRCLE_BUILD_NUM}
               testResult=$(gsutil ls gs://test-lab-186672a0qp5bq-ycr70axads3nc/render-test-app-${CIRCLE_BUILD_NUM}/**/*.html | tail -1)
diff --git a/render-test/android/app/build.gradle b/render-test/android/app/build.gradle
index cb864128a2..7d53469f71 100644
--- a/render-test/android/app/build.gradle
+++ b/render-test/android/app/build.gradle
@@ -26,6 +26,15 @@ android {
             }
         }
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        def result = "debug";
+
+        if (project.hasProperty("testBuildType")) {
+            result = project.getProperties().get("testBuildType")
+        }
+        android {
+            testBuildType result
+        }
     }
     externalNativeBuild {
         cmake {
@@ -33,6 +42,19 @@ android {
             path '../../../next/CMakeLists.txt'
         }
     }
+    signingConfigs {
+        release {
+            storeFile file("test.jks")
+            storePassword "password"
+            keyAlias "test"
+            keyPassword "password"
+        }
+    }
+    buildTypes {
+        release {
+            signingConfig signingConfigs.release
+        }
+    }
 }
 
 dependencies {
diff --git a/render-test/android/app/test.jks b/render-test/android/app/test.jks
new file mode 100644
index 0000000000..a9d02bef98
--- /dev/null
+++ b/render-test/android/app/test.jks