From 185eb5b414e202419a807973244432419841905d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 26 Oct 2017 14:06:14 +0300 Subject: Cleanup of provisioning scripts as tier1 images are vanilla Change-Id: I58c5cb64075c0b60e2e8881dd32d6fad3ab98ec7 Reviewed-by: Heikki Halmet --- coin/provisioning/common/cmake.ps1 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'coin/provisioning/common/cmake.ps1') diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 8a94dc5d..1716467c 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -44,12 +44,6 @@ Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" Extract-Zip $zip C: -# TODO: Remove line below after all Windows TIER2 VMs are based on vanilla OS -if((Test-Path -Path "C:\CMake" )){ - try { - Rename-Item -ErrorAction 'Stop' "C:\CMake" C:\CMake_old - } catch {} -} $defaultinstallfolder = "C:\cmake-" + $version + "-win32-x86" Rename-Item $defaultinstallfolder C:\CMake -- cgit v1.2.3 From a8bd91bc277de146979372831347cede8e60b280 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 10 Nov 2017 12:50:41 +0200 Subject: Provisioning: Remove old cmake before installing new one MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows 10 x86 isn't yet vanilla so provisioning needs to remove old cmake before installation Change-Id: I2712aaa652492520d68a597d99a3c2d6bdbe2433 Reviewed-by: Iikka Eklund Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/cmake.ps1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'coin/provisioning/common/cmake.ps1') diff --git a/coin/provisioning/common/cmake.ps1 b/coin/provisioning/common/cmake.ps1 index 1716467c..d7e26556 100644 --- a/coin/provisioning/common/cmake.ps1 +++ b/coin/provisioning/common/cmake.ps1 @@ -40,6 +40,9 @@ $zip = "c:\users\qt\downloads\cmake-" + $version + "-win32-x86.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-win32-x86.zip" $cachedurl = "\\ci-files01-hki.intra.qt.io\provisioning\cmake\cmake-" + $version + "-win32-x86.zip" +echo "Removing old cmake" +Remove-Item "C:\CMake" -Force -Recurse -ErrorAction SilentlyContinue + Download $officialurl $cachedurl $zip Verify-Checksum $zip "541F6E7EFD228E46770B8631FFE57097576E4D4E" -- cgit v1.2.3