diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-12-28 11:43:52 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-02-06 18:36:03 +0000 |
| commit | de0797d80983f29cef31e0cc1814ffb8898fa9ab (patch) | |
| tree | 944d1a6e2f08d39474c161255450d772a4755c97 | |
| parent | cf2365c2ec29a2d29f54407d262f3461124a82e7 (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
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>
(cherry picked from commit 710f03ffcca35bacb99cc2c0134c751fb39d2771)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 12 |
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 abc6efc0..1adc4efc 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -131,6 +131,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" \ |