From b1a212b52ea909adc95078c0100f962762daef81 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Thu, 22 Feb 2018 10:22:12 +0200 Subject: Provisioning: Make Windows scripts use the Download helper function Some Windows provisioning scripts use the Invoke-WebRequest without setting the ProgressPreference = 'SilentlyContinue' variable for disabling the download progress bar. Disabling the progress bar greatly increases the download speed during provisioning. Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8 Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/3dstudio_3rdparty.ps1 | 3 ++- coin/provisioning/common/windows/install-jdk.ps1 | 4 ++-- coin/provisioning/common/windows/winrtrunner.ps1 | 3 ++- coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 | 3 ++- 4 files changed, 8 insertions(+), 5 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 index f9c8faa7..b6804a77 100644 --- a/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 +++ b/coin/provisioning/common/windows/3dstudio_3rdparty.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot\helpers.ps1" $zip = "c:\users\qt\downloads\Qt3DStudio-3rdparty-win64-CI.zip" +$url = "http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/3rdparty/Qt3DStudio-3rdparty-win64-CI.zip -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "08D740D2EFB4CBCDE7D012908B89AA48DE5CD4E1" Extract-Zip $zip C:\Utils\Qt3DStudio3rdparty Remove-Item $zip diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index f6cf6a66..63e5edaf 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -55,7 +55,7 @@ echo "Fetching Java SE $version..." $ProgressPreference = 'SilentlyContinue' try { echo "...from local cache" - Invoke-WebRequest -UseBasicParsing $url_cache -OutFile $javaPackage + Download $url_cache $url_cache $javaPackage } catch { echo "...from oracle.com" $client = new-object System.Net.WebClient @@ -63,7 +63,7 @@ try { $client.Headers.Add("Cookie", $cookie) $client.DownloadFile($official_url, $javaPackage) - Invoke-WebRequest -UseBasicParsing $official_url -OutFile $javaPackage + Download $official_url $official_url $javaPackage } Verify-Checksum $javaPackage $sha1 diff --git a/coin/provisioning/common/windows/winrtrunner.ps1 b/coin/provisioning/common/windows/winrtrunner.ps1 index f433ac7a..d53c12d6 100644 --- a/coin/provisioning/common/windows/winrtrunner.ps1 +++ b/coin/provisioning/common/windows/winrtrunner.ps1 @@ -1,8 +1,9 @@ . "$PSScriptRoot\helpers.ps1" $zip = "c:\users\qt\downloads\winrtrunner.zip" +$url = "http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip" -Invoke-WebRequest -UseBasicParsing http://download.qt.io/development_releases/prebuilt/winrtrunner/winrtrunner.zip -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "C19098A4C9DBD20EDEB4E5E0D3E6A5BBBCA73C42" Extract-Zip $zip C:\Utils\winrtrunner Remove-Item $zip diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 index a7a8c035..d2864281 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1 @@ -36,8 +36,9 @@ # This script installs QNX SDP 7.0 $zip = "c:\users\qt\downloads\qnx700.7z" +$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z" -Invoke-WebRequest -UseBasicParsing http://ci-files01-hki.intra.qt.io/input/qnx/qnx700.7z -OutFile $zip +Download $url $url $zip Verify-Checksum $zip "DD3346A3429C06B59BF4D45CE0782F737D2424C7" Extract-7Zip $zip C:\ -- cgit v1.2.3