Provisioning: Fetch icu from ci-files01 instead of master.qt.io

Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>

1 files changed, 15 insertions, 9 deletions

diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
index 67c17954..90d4199f 100755
--- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
+++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh
@@ -2,7 +2,7 @@
 
 #############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2018 The Qt Company Ltd.
 ## Contact: http://www.qt.io/licensing/
 ##
 ## This file is part of the test suite of the Qt Toolkit.
@@ -33,6 +33,9 @@
 ##
 #############################################################################
 
+# shellcheck source=../common/unix/DownloadURL.sh
+source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
+
 # This script installs the right ICU version
 
 set -ex
@@ -42,29 +45,31 @@ sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753"
 
 function Install7ZPackageFromURL {
     url=$1
-    expectedSha1=$2
-    targetDirectory=$3
+    urlExt=$2
+    expectedSha1=$3
+    targetDirectory=$4
 
     targetFile=$(mktemp)
-    wget --tries=5 --waitretry=5 --output-document="$targetFile" "$url"
-    echo "$expectedSha1  $targetFile" | sha1sum --check
+    DownloadURL "$url" "$urlExt" "$expectedSha1" "$targetFile"
     sudo /usr/local/bin/7z x -yo"$targetDirectory" "$targetFile"
     rm "$targetFile"
 }
 
 echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation"
 
-baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
-Install7ZPackageFromURL "$baseBinaryPackageURL" "$sha1" "/usr/lib64"
+baseBinaryPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
+baseBinaryPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z"
+Install7ZPackageFromURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalUrl" "$sha1" "/usr/lib64"
 
 echo "Installing custom ICU devel packages on RHEL"
 
 sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df"
-develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
+develPackageURL="http://ci-files01-hki.intra.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
+develPackageExternalUrl="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z"
 tempDir=$(mktemp -d)
 # shellcheck disable=SC2064
 trap "sudo rm -fr $tempDir" EXIT
-Install7ZPackageFromURL "$develPackageURL" "$sha1Dev" "$tempDir"
+Install7ZPackageFromURL "$develPackageURL" "$develPackageExternalUrl" "$sha1Dev" "$tempDir"
 sudo cp -a "$tempDir/lib"/* /usr/lib64
 sudo cp -a "$tempDir"/* /usr/
 
@@ -72,3 +77,4 @@ sudo /sbin/ldconfig
 
 # Storage version information to ~/versions.txt, which is used to print version information to provision log.
 echo "ICU = $icuVersion" >> ~/versions.txt
+