From 8b34f372b0decde87669cae6cb531b1acfdb9148 Mon Sep 17 00:00:00 2001
From: Aaron Train <aaron.train@gmail.com>
Date: Wed, 1 Apr 2020 18:43:45 -0400
Subject: [PATCH] Closes #9433: Update Flank version in ui-tests Dockerfile
 (#9466)

fix: flank_snapshot requires direct shard value

-1 shards -> 50 shards

fix: adjust flank-x86.yml shard value

try old results generator in flank-x86.yml

fix: legacy-junit-report -> legacy-junit-result

revert to modern reporting
---
 automation/taskcluster/androidTest/flank-x86.yml | 2 +-
 taskcluster/ci/ui-test/kind.yml                  | 2 +-
 taskcluster/docker/ui-tests/Dockerfile           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/automation/taskcluster/androidTest/flank-x86.yml b/automation/taskcluster/androidTest/flank-x86.yml
index 1c4e0ba33..1cde8ed39 100644
--- a/automation/taskcluster/androidTest/flank-x86.yml
+++ b/automation/taskcluster/androidTest/flank-x86.yml
@@ -50,7 +50,7 @@ flank:
   project: GOOGLE_PROJECT
   # test shards - the amount of groups to split the test suite into
   # set to -1 to use one shard per test.
-  max-test-shards: -1 
+  max-test-shards: 50 
   # num-test-runs: the amount of times to run the tests.
   # 1 runs the tests once. 10 runs all the tests 10x
   num-test-runs: 1
diff --git a/taskcluster/ci/ui-test/kind.yml b/taskcluster/ci/ui-test/kind.yml
index 5e46a3ed7..4426d8989 100644
--- a/taskcluster/ci/ui-test/kind.yml
+++ b/taskcluster/ci/ui-test/kind.yml
@@ -28,7 +28,7 @@ jobs:
             commands:
                 - [wget, {artifact-reference: '<signing/public/build/x86/geckoNightly/target.apk>'}, '-O', app.apk]
                 - [wget, {artifact-reference: '<signing-android-test/public/build/noarch/geckoNightly/target.apk>'}, '-O', android-test.apk]
-                - [automation/taskcluster/androidTest/ui-test.sh, x86, app.apk, android-test.apk, '-1']
+                - [automation/taskcluster/androidTest/ui-test.sh, x86, app.apk, android-test.apk, '50']
             secrets:
                 - name: project/mobile/fenix/firebase
                   key: firebaseToken
diff --git a/taskcluster/docker/ui-tests/Dockerfile b/taskcluster/docker/ui-tests/Dockerfile
index a5bd337f2..3e8f91c44 100644
--- a/taskcluster/docker/ui-tests/Dockerfile
+++ b/taskcluster/docker/ui-tests/Dockerfile
@@ -10,7 +10,7 @@ USER worker:worker
 
 ENV GOOGLE_SDK_DOWNLOAD ./gcloud.tar.gz
 ENV GOOGLE_SDK_VERSION 233
-ENV FLANK_VERSION v8.0.1 
+ENV FLANK_VERSION flank_snapshot
 
 ENV TEST_TOOLS /builds/worker/test-tools
 ENV PATH ${PATH}:${TEST_TOOLS}:${TEST_TOOLS}/google-cloud-sdk/bin