From 580a25673a47e20a7a92751c283b60a71235f01d Mon Sep 17 00:00:00 2001
From: Marco Castelluccio <mcastelluccio@mozilla.com>
Date: Thu, 6 Jun 2024 06:01:30 +0000
Subject: [PATCH] [fenix] No issue: Update Flank to v21.07.1
 (https://github.com/mozilla-mobile/fenix/pull/20456)

* Update Flank to v21.07.1
* Update approach to downloading Flank
* Update parse-ui-test.py

UltraBlame original commit: cca7f43771212dd81b03d13690197d4c91ca63cb
---
 .../taskcluster/androidTest/parse-ui-test.py  |   2 +-
 .../taskcluster/docker/ui-tests/Dockerfile    | 113 ++++++++++--------
 2 files changed, 65 insertions(+), 50 deletions(-)

diff --git a/mobile/android/fenix/automation/taskcluster/androidTest/parse-ui-test.py b/mobile/android/fenix/automation/taskcluster/androidTest/parse-ui-test.py
index 435047f6a5626..fe035ab336432 100644
--- a/mobile/android/fenix/automation/taskcluster/androidTest/parse-ui-test.py
+++ b/mobile/android/fenix/automation/taskcluster/androidTest/parse-ui-test.py
@@ -475,7 +475,7 @@
 )
 |
 {
-testAxises
+axes
 [
 0
 ]
diff --git a/mobile/android/fenix/taskcluster/docker/ui-tests/Dockerfile b/mobile/android/fenix/taskcluster/docker/ui-tests/Dockerfile
index ab750cbb1dda2..31f5d75c63db9 100644
--- a/mobile/android/fenix/taskcluster/docker/ui-tests/Dockerfile
+++ b/mobile/android/fenix/taskcluster/docker/ui-tests/Dockerfile
@@ -381,6 +381,21 @@ tools
 -
 -
 -
+RUN
+apt
+-
+get
+install
+-
+y
+jq
+\
+&
+&
+apt
+-
+get
+clean
 USER
 worker
 :
@@ -398,13 +413,6 @@ ENV
 GOOGLE_SDK_VERSION
 233
 ENV
-FLANK_VERSION
-v21
-.
-05
-.
-0
-ENV
 TEST_TOOLS
 /
 builds
@@ -568,14 +576,23 @@ gcloud
 quiet
 components
 update
+#
+Flank
+v21
+.
+07
+.
+1
 RUN
 URL_FLANK_BIN
 =
+"
 (
-curl
+CURL
 -
-s
-"
+-
+silent
+'
 https
 :
 /
@@ -593,56 +610,46 @@ Flank
 flank
 /
 releases
-"
-|
-grep
-"
-browser_download_url
-*
-"
-|
-grep
-"
-{
-FLANK_VERSION
-}
-"
+/
+latest
+'
 |
-sed
+jq
 -
 r
-"
-s
-/
-\
-"
-/
-/
-g
-"
+'
+.
+assets
+[
+]
 |
-cut
--
-d
+select
+(
+.
+browser_download_url
+|
+test
+(
 "
-:
+flank
+.
+jar
 "
--
-f3
 )
+)
+.
+browser_download_url
+'
+)
+"
 \
 &
 &
-wget
-"
-https
-:
-{
-URL_FLANK_BIN
-}
-"
+CURL
 -
-O
+-
+output
+"
 {
 TEST_TOOLS
 }
@@ -650,12 +657,19 @@ TEST_TOOLS
 flank
 .
 jar
+"
+"
+{
+URL_FLANK_BIN
+}
+"
 \
 &
 &
 chmod
 +
 x
+"
 {
 TEST_TOOLS
 }
@@ -663,6 +677,7 @@ TEST_TOOLS
 flank
 .
 jar
+"
 #
 run
 -