diff options
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8396743e..c615f9eb 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,11 +36,11 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.5.2" -$qtBranch = "514x" +$version = "6.6.1" +$qtBranch = "515x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" -$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build" +$squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" $licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" # Squish license @@ -60,17 +60,19 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "9262d3b749483094024c74986f93e9340afbdb62" + $sha1 = "17b5bec83f448877e42e5effdc7daf723d157800" } else { - $sha1 = "0763b344afa327e6c374971492021c5e923be892" + $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" + #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild + $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" - $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" + $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" -Copy-Item "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\$squishArchive" "C:\Utils" +Copy-Item "$squishUrl\$squishArchive" "C:\Utils" Verify-Checksum "C:\Utils\$squishArchive" $sha1 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" Rename-Item "$squishPackage" "$targetDir" |