From 409a50fe9230afc8635707215ba96a5fe32a63c9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 4 Apr 2016 21:13:44 +0200
Subject: [PATCH 1/2] gitlab-ci: upload full build logs to clbin.com

I find that the logs dumped into the gitlab-ci screens are generally
unreadable, so here, only the errors are dumped into the build log, then
the rest are uploaded to clbin, a paste bin, where the whole text can be
viewed and downloaded in a clean, raw format.
---
 .gitlab-ci.yml | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3f64efe6c..f9228f237 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,17 +7,37 @@ cache:
 
 gradle:
   script:
+    - apt-get -y update
+    - apt-get -y install curl
     - export GRADLE_USER_HOME=$PWD/.gradle
-    - ./gradlew assemble
     # always report on lint errors to the build log
     - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
-    - ./gradlew check
+    # 'build' means assemble and check
+    - ./gradlew build || {
+          for log in app/build/reports/*ests/*/*ml; do
+              echo "read $log here:"
+              cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+          done;
+          exit 1;
+      }
     - echo no | android create avd --force -n fcl-test -t android-10 -b armeabi
     - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82
-    - ADB_INSTALL_TIMEOUT=8 ./gradlew connectedCheck || { adb logcat -d '*:W'; exit 1; }
+    - export EXITVALUE=0
+    - ADB_INSTALL_TIMEOUT=8 ./gradlew connectedCheck || {
+        adb -e logcat -d '*:E';
+        echo "get the full logcat here:";
+        adb -e logcat -d | curl --silent -F 'clbin=<-' https://clbin.com;
+        export EXITVALUE=1;
+      }
+    - for log in app/build/reports/*ests/*/*ml
+                 app/build/outputs/*results*/connected/*.xml; do
+        echo "read $log here:";
+        cat "$log" | curl --silent -F 'clbin=<-' https://clbin.com;
+      done
     - sed -n 's/.*"ctr2">\([0-9]*\)%<.*/Coverage - \1.0% covered\n/p' app/build/reports/coverage/debug/index.html
+    - exit $EXITVALUE
 
 pmd:
   script:

From 37bca5d2440a70a9cbd259d9bfac0d23788f701a Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 4 Apr 2016 21:13:57 +0200
Subject: [PATCH 2/2] gitlab-ci: use android-17 emulator for `gradle
 connectedCheck`

The android-10 emulator does not report test failures so it is pretty
useless at the moment.  After lots and lots of trying, the most recent
emulator that I could get running on gitlab-ci was 17, so let's hope that
turns out to be more useful.  I also had to reduce the RAM that was used,
it seems that gitlab-ci does not let the docker images use much RAM.

This might be able to be improved by creating an pre-setup AVD image in the
docker image used by this.
---
 .gitlab-ci.yml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f9228f237..a755ccc9e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,10 +5,16 @@ cache:
     - .gradle/wrapper
     - .gradle/caches
 
+variables:
+  AVD_SDK: "17"
+  SKIN: "QVGA"
+
 gradle:
   script:
     - apt-get -y update
     - apt-get -y install curl
+    - echo y | android update sdk --no-ui --filter android-$AVD_SDK
+    - echo y | android update sdk --no-ui --all --filter sys-img-armeabi-v7a-android-$AVD_SDK
     - export GRADLE_USER_HOME=$PWD/.gradle
     # always report on lint errors to the build log
     - sed -i -e 's,textReport .*,textReport true,' app/build.gradle
@@ -20,7 +26,18 @@ gradle:
           done;
           exit 1;
       }
-    - echo no | android create avd --force -n fcl-test -t android-10 -b armeabi
+    # emulators will only start if they have tiny amounts of RAM
+    - sed -i -e 's,^hw.ramSize=.*,hw.ramSize=384,'
+             -e 's,^vm.heapSize=.*,vm.heapSize=48,'
+             -e 's,^hw.gpu.enabled.*,hw.gpu.enabled = false,'
+             $ANDROID_HOME/platforms/android-$AVD_SDK/skins/$SKIN/hardware.ini
+    - echo "hw.gpu.enabled = false" >>
+             $ANDROID_HOME/platforms/android-$AVD_SDK/skins/$SKIN/hardware.ini
+    - echo no | android --verbose create avd
+        --force
+        --name fcl-test
+        --skin $SKIN
+        --target android-$AVD_SDK
     - emulator -force-32bit -avd fcl-test -no-skin -no-audio -no-window &
     - ./tools/wait-for-emulator
     - adb shell input keyevent 82