From da53bedd80456c11e2b0a7f1fb428fa9a57af374 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 14 Aug 2018 13:26:01 +0300 Subject: Provisioning: Relocate Libclang and correct sha1 Sha1's were changed because Liclang versions were rebuilded. To prevent this Libclang versions are now copied to ci-files01-hki which won't be affected if someone will rebuild libclang versions to download.qt.io. This will also reduce download time Task-number: QTQAINFRA-2156 Change-Id: I9164441cb876ee687db4878d06ba1c02cde601bb Reviewed-by: Sami Nurmenniemi Reviewed-by: Jani Heikkinen --- coin/provisioning/common/unix/libclang.sh | 2 +- coin/provisioning/common/windows/libclang.ps1 | 4 ++-- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh | 2 +- coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh | 2 +- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 7f29259e..31e545da 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -52,7 +52,7 @@ if [ $# -eq 0 ] # The default values are for macOS package echo "Using macOS defaults" version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${version//\./}-mac.7z" + url="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version//\./}-mac.7z" sha1="4781d154b274b2aec99b878c364f0ea80ff00a80" fi diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index afcad2ec..7e5e31a5 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -12,10 +12,10 @@ Get-Content "$PSScriptRoot\..\shared\sw_versions.txt" | Foreach-Object { if ( $archVer -eq 64 ) { $sha1 = "dc42beb0efff130c4d7dfef3c97adf26f1ab04e0" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_64.7z" + $url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_64.7z" } else { $sha1 = "64e826c00ae632fbb28655e6e1fa9194980e1205" - $url = "https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_$libclang_version-windows-vs2015_32.7z" + $url = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-vs2015_32.7z" } $zip = "c:\users\qt\downloads\libclang.7z" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh index fb5a81b3..5807e484 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/08-libclang.sh @@ -5,7 +5,7 @@ set -ex BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" +URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel6.6-gcc4.9-x86_64.7z" SHA1="c7466109628418a6aa3db8b3f5825f847f1c4952" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh index 49d4d4f5..ddb09b48 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/05-libclang.sh @@ -4,7 +4,7 @@ set -ex BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh index b4155e86..277e4f54 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/08-libclang.sh @@ -5,7 +5,7 @@ set -ex BASEDIR=$(dirname "$0") . $BASEDIR/../common/shared/sw_versions.txt VERSION=$libclang_version -URL="https://download.qt.io/development_releases/prebuilt/libclang/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" +URL="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${VERSION//\./}-linux-Rhel7.2-gcc5.3-x86_64.7z" SHA1="bbdbbc0296f42310077539b7247d285386119ef4" $BASEDIR/../common/unix/libclang.sh "$URL" "$SHA1" "$VERSION" -- cgit v1.2.1