From a516bb6681e2a87b18afbf6764e8ea7b5bca34d8 Mon Sep 17 00:00:00 2001 From: Aaron Train Date: Wed, 21 Jul 2021 14:10:14 -0400 Subject: [PATCH] No issue: Update Flank to v21.07.1 (#20456) * Update Flank to v21.07.1 * Update approach to downloading Flank * Update parse-ui-test.py --- automation/taskcluster/androidTest/parse-ui-test.py | 2 +- taskcluster/docker/ui-tests/Dockerfile | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/automation/taskcluster/androidTest/parse-ui-test.py b/automation/taskcluster/androidTest/parse-ui-test.py index e2da3ea27..18893f6ca 100644 --- a/automation/taskcluster/androidTest/parse-ui-test.py +++ b/automation/taskcluster/androidTest/parse-ui-test.py @@ -55,7 +55,7 @@ def main(): print("| matrix | result | logs | details \n") print("| --- | --- | --- | --- |\n") for matrix, matrix_result in matrix_ids.items(): - print("| {matrixId} | {outcome} | [logs]({webLink}) | {testAxises[0][details]}\n".format(**matrix_result)) + print("| {matrixId} | {outcome} | [logs]({webLink}) | {axes[0][details]}\n".format(**matrix_result)) if __name__ == "__main__": diff --git a/taskcluster/docker/ui-tests/Dockerfile b/taskcluster/docker/ui-tests/Dockerfile index c2393f89b..2bb16e314 100644 --- a/taskcluster/docker/ui-tests/Dockerfile +++ b/taskcluster/docker/ui-tests/Dockerfile @@ -7,11 +7,13 @@ LABEL maintainer="Richard Pappalardo " #-- Test tools -------------------------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------------------------------------- +RUN apt-get install -y jq \ + && apt-get clean + USER worker:worker ENV GOOGLE_SDK_DOWNLOAD ./gcloud.tar.gz ENV GOOGLE_SDK_VERSION 233 -ENV FLANK_VERSION v21.05.0 ENV TEST_TOOLS /builds/worker/test-tools ENV PATH ${PATH}:${TEST_TOOLS}:${TEST_TOOLS}/google-cloud-sdk/bin @@ -25,9 +27,11 @@ RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud && ${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/Flank/flank/releases" | grep "browser_download_url*" | grep "${FLANK_VERSION}" | sed -r "s/\"//g" | cut -d ":" -f3) \ - && wget "https:${URL_FLANK_BIN}" -O ${TEST_TOOLS}/flank.jar \ - && chmod +x ${TEST_TOOLS}/flank.jar +# Flank v21.07.1 + +RUN URL_FLANK_BIN="$($CURL --silent 'https://api.github.com/repos/Flank/flank/releases/latest' | jq -r '.assets[] | select(.browser_download_url | test("flank.jar")) .browser_download_url')" \ + && $CURL --output "${TEST_TOOLS}/flank.jar" "${URL_FLANK_BIN}" \ + && chmod +x "${TEST_TOOLS}/flank.jar" # run-task expects to run as root