From 9af35703bfbdd40fdaa81c6c6493eaba24af2ee5 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 15 Oct 2024 11:30:57 +0300 Subject: [PATCH] Provisioning: Fix ci-files01-hki to use correct URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace ci-files01-hki.intra.qt.io with ci-files01-hki.ci.qt.io Task-number: QTQAINFRA-6663 Pick-to: 6.5 5.15 Change-Id: Ia9a6b1fc5a23b6f1a393d6e4be8be41e2991e876 Reviewed-by: Simo Fält (cherry picked from commit d197f066343bcca439a6415761f17feec0a71d98) Reviewed-by: Aku Pietikäinen Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-patchelf.sh | 2 +- coin/provisioning/common/windows/install-ffmpeg.ps1 | 2 +- .../93-download-files-for-sbuild.sh | 2 +- .../93-download-files-for-sbuild.sh | 2 +- .../93-download-files-for-sbuild.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 8e10e351..3779478a 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -6,7 +6,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" patchelf_version="0.17.2" -url_cached="https://ci-files01-hki.intra.qt.io/input/android/patchelf/$patchelf_version.tar.gz" +url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz" url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz" sha1="ddd46a2e2a16a308245c008721d877455b23bba8" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 77f642f3..f2c36417 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -188,7 +188,7 @@ function InstallAndroidArmv7 { Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"") $patchelf_sha1 = "DDD46A2E2A16A308245C008721D877455B23BBA8" - $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.17.2.tar.gz" + $patchelf_sources = "https://ci-files01-hki.ci.qt.io/input/android/patchelf/0.17.2.tar.gz" $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz" Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh index b31a86f2..8d0e9e70 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh @@ -6,7 +6,7 @@ mkdir -p /home/qt/debian_packages cd /home/qt/debian_packages || exit # Backported cmake 3.24 -wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz +wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz tar xzf cmake-3.24-deb.tar.gz # get rest of ready made Ubuntu arm debian packages # so that sbuild can find those diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh index 8b8530a3..d344956b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh @@ -6,7 +6,7 @@ mkdir -p /home/qt/debian_packages cd /home/qt/debian_packages || exit # Backported cmake 3.24 -wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz +wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz tar xzf cmake-3.24-deb.tar.gz rm -rf cmake-3.24-deb.tar.gz # get rest of ready made Ubuntu jammy arm debian packages diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh index f2192a4f..8f53319c 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh @@ -6,7 +6,7 @@ mkdir -p /home/qt/debian_packages cd /home/qt/debian_packages || exit # Backported cmake 3.24 -wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz +wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz tar xzf cmake-3.24-deb.tar.gz rm -rf cmake-3.24-deb.tar.gz # TODO: Adapt this from jammy to noble Ubuntu 24.04: