From 937d8ef8d6a5f5aca6a3a2ad0189aed18fd0bfa3 Mon Sep 17 00:00:00 2001
From: Leith Bade <leith@mapbox.com>
Date: Fri, 2 Jan 2015 09:56:55 +1300
Subject: [PATCH] Use testmunk from EC2

---
 android/scripts/build-release.sh                          | 1 +
 android/scripts/common.sh                                 | 6 +++++-
 .../upload_testmunk.sh => scripts/upload-testmunk.sh}     | 0
 scripts/travis_script.sh                                  | 8 --------
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename android/{test/upload_testmunk.sh => scripts/upload-testmunk.sh} (100%)

diff --git a/android/scripts/build-release.sh b/android/scripts/build-release.sh
index 73c7fab81..c5fb9c19b 100755
--- a/android/scripts/build-release.sh
+++ b/android/scripts/build-release.sh
@@ -4,5 +4,6 @@ set -e
 set -o pipefail
 
 export BUILDTYPE=Release
+export TESTMUNK=yes
 
 ./android/scripts/common.sh $1
diff --git a/android/scripts/common.sh b/android/scripts/common.sh
index 7874d1adc..5a4036ace 100755
--- a/android/scripts/common.sh
+++ b/android/scripts/common.sh
@@ -14,7 +14,11 @@ export MASON_PLATFORM=android
 mkdir ./android/java/app/src/main/res/raw/
 echo "${MAPBOX_ACCESS_TOKEN}" >> ./android/java/app/src/main/res/raw/token.txt
 
-make android BUILDTYPE=$BUILDTYPE
+make android BUILDTYPE=$BUILDTYPE JOBS=$JOBS
 
 aws s3 cp ./android/java/app/build/outputs/apk/app-debug.apk s3://mapbox-gl-testing/android/${NAME}/app-debug.apk
 aws s3 cp ./android/java/app/build/outputs/apk/app-release-unsigned.apk s3://mapbox-gl-testing/android/${NAME}/app-release-unsigned.apk
+
+if [[ $TESTMUNK == "yes" ]]; then
+    ./android/scipts/upload-testmunk.sh ./android/java/app/build/outputs/apk/app-debug.apk
+fi
diff --git a/android/test/upload_testmunk.sh b/android/scripts/upload-testmunk.sh
similarity index 100%
rename from android/test/upload_testmunk.sh
rename to android/scripts/upload-testmunk.sh
diff --git a/scripts/travis_script.sh b/scripts/travis_script.sh
index 994e435fd..308dfb8f1 100755
--- a/scripts/travis_script.sh
+++ b/scripts/travis_script.sh
@@ -7,16 +7,8 @@ mapbox_time "checkout_styles" \
 git submodule update --init styles
 
 if [[ $MASON_PLATFORM == "android" ]]; then
-    #mapbox_time "compile_program" \
-    #make android BUILDTYPE=${BUILDTYPE}
     ./android/scripts/run-build.sh
 
-    #if [[ $TESTMUNK == "yes" ]]; then
-        #mapbox_time_start "upload_testmunk"
-        #(cd ./android/test/ && ./upload_testmunk.sh ../java/app/build/outputs/apk/app-debug.apk)
-        #mapbox_time_finish
-    #fi
-
 elif [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
     #
     # build & test Linux