aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2023-12-28 11:43:52 +0100
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2024-01-31 19:07:06 +0000
commit710f03ffcca35bacb99cc2c0134c751fb39d2771 (patch)
tree69024e6a9b69155a1bb34fabd3fdd95da41de5a3 /coin/provisioning/common
parent137a747c5841486fea3efba9cd1fbc3b64e4cdaf (diff)
Android: use Android emulator 32.1.15 to not break rhi tests
Currently CI doesn't cache specific Android Emulator version, so after an update was availabe 33.1.23 is broke RHI tests on Android 13 emulator. The last known emulator version to to work was 32.1.15, so as a workaround we install this specific version. Fixes: QTBUG-119884 Pick-to: 6.7 Change-Id: Iec56207b6142d97a9dfabc0fb07a920c868e58b1 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit 481825822b5f714e584bb5eab70432ecd2ac446f) Reviewed-by: Zoltan Gera <zoltan.gera@qt.io> Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/provisioning/common')
-rwxr-xr-xcoin/provisioning/common/linux/android_linux.sh12
1 files changed, 12 insertions, 0 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index 45af2183..3e358251 100755
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -135,6 +135,18 @@ EOB
cd "$sdkTargetFolder/cmdline-tools/tools/bin"
./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
| eval "$sdkmanager_no_progress_bar_cmd"
+
+echo "Download and unzip Android Emulator version 32.1.15"
+emulatorFileName="emulator-linux_x64-10696886.zip"
+emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
+emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
+emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
+emulatorSha1="b78f4d2c22d6aa5ca83d26ccb68cbf885a273888"
+DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
+echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
+sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
+rm "$emulatorTargetFile"
+
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
| eval "$sdkmanager_no_progress_bar_cmd"
echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \