From 2a099ca7140b84e398975534801520b35f62a420 Mon Sep 17 00:00:00 2001
From: Richard Pappalardo <rpappalax@gmail.com>
Date: Wed, 1 May 2019 20:58:30 +0000
Subject: [PATCH] Update Dockerfile with UI test deps

---
 automation/docker/Dockerfile | 32 +++++++++++++++++++++++++++++---
 gradle.properties            |  3 ++-
 2 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/automation/docker/Dockerfile b/automation/docker/Dockerfile
index cc0462cee..e1471e8d0 100644
--- a/automation/docker/Dockerfile
+++ b/automation/docker/Dockerfile
@@ -5,16 +5,21 @@
 # Inspired by:
 # https://hub.docker.com/r/runmymind/docker-android-sdk/~/dockerfile/
 
-FROM ubuntu:17.10
+FROM ubuntu:18.04
 
 MAINTAINER Sebastian Kaspari "skaspari@mozilla.com"
 
+# -- Configuration ----------------------------------------------------------------------
+
+ENV GOOGLE_SDK_VERSION 233
+
 # -- System -----------------------------------------------------------------------------
 
 RUN apt-get update -qq
 
 RUN apt-get install -y openjdk-8-jdk \
 					   curl \
+					   wget \
 					   git \
 					   python \
 					   python-pip \
@@ -49,11 +54,32 @@ RUN sdkmanager --verbose "platform-tools" \
     "extras;google;m2repository"
 
 # Checkout source code
-RUN git clone https://github.com/mozilla-mobile/fenix.git
+#RUN git clone https://github.com/mozilla-mobile/fenix.git
+RUN git clone https://github.com/rpappalax/fenix.git -b dockerfile-add-test-deps --single-branch
 
 # Build project and run gradle tasks once to pull all dependencies
 WORKDIR /opt/fenix
-RUN ./gradlew --no-daemon assemble test lint
+RUN ./gradlew -PversionName=0.0 --no-daemon assemble test lint
+
+# -- Test tools -------------------------------------------------------------------------
+
+RUN mkdir -p /build/test-tools
+
+WORKDIR /build
+
+ENV TEST_TOOLS /build/test-tools
+ENV GOOGLE_SDK_DOWNLOAD ./gcloud.tar.gz
+ENV PATH ${PATH}:${TEST_TOOLS}:${TEST_TOOLS}/google-cloud-sdk/bin
+
+RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GOOGLE_SDK_VERSION}.0.0-linux-x86_64.tar.gz --output ${GOOGLE_SDK_DOWNLOAD} \
+    && tar -xvf ${GOOGLE_SDK_DOWNLOAD} -C ${TEST_TOOLS} \
+    && rm -f ${GOOGLE_SDK_DOWNLOAD} \
+    && ${TEST_TOOLS}/google-cloud-sdk/install.sh --quiet \
+    && ${TEST_TOOLS}/google-cloud-sdk/bin/gcloud --quiet components update
+
+RUN URL_FLANK_BIN=$(curl -s "https://api.github.com/repos/TestArmada/flank/releases/latest" | grep "browser_download_url*" | sed -r "s/\"//g" | cut -d ":" -f3) \
+    && wget "https:${URL_FLANK_BIN}" -O ${TEST_TOOLS}/flank.jar \
+    && chmod +x ${TEST_TOOLS}/flank.jar
 
 # -- Post setup -------------------------------------------------------------------------
 
diff --git a/gradle.properties b/gradle.properties
index f0221c16b..14194767b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,4 +17,5 @@ android.useAndroidX=true
 android.enableJetifier=true
 android.enableR8=true
 android.enableR8.fullMode=true
-android.enableUnitTestBinaryResources=true
\ No newline at end of file
+android.enableUnitTestBinaryResources=true
+org.gradle.parallel=false