diff options
author | Evgenii Kucheruk <evgenii.kucheruk@qt.io> | 2023-11-28 10:28:27 +0200 |
---|---|---|
committer | Johanna Äijälä <johanna.aijala@qt.io> | 2023-12-18 05:32:44 +0000 |
commit | f6b96f848f5092a8a913f9e1ce0d601bb5e06a8b (patch) | |
tree | 0cff54c55290c08376c239e7b741db6cf44bde33 /coin/provisioning/common/windows/squishInstall.ps1 | |
parent | 027acd91fd68ef748b81842ecefa8d471a480bd8 (diff) |
Add changes to Squish installation for 7.2.1
Pick-to: 6.6
Pick-to: 6.7
Change-Id: I620776afb2e4575ffbc9b9c3c6c53c25516add08
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows/squishInstall.ps1')
-rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 84b9833b..ec4d240a 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -6,12 +6,14 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "7.0.1" -$qtBranch = "63x" +$version = "7.2.1" +$qtBranch = "66x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\coin\$qtBranch" +$licenseBranch="squish_license" +$licenseUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\coin\$licenseBranch" +$testSuiteUrl="\\ci-files01-hki.ci.qt.io\provisioning\squish\coin\suite_test_squish" # Squish license $licensePackage = ".squish-license" @@ -31,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro # In Windows 11 case $OSVersion is 'Windows 10 Pro' $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "9c1554ba55f3d4927f89d0d939a52988272d5494" + $sha1 = "eed4ed4936fbbacb11e0d8a00ff190e1ea808eeb" } } else { $winVersion = "n/a" @@ -39,11 +41,12 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" Copy-Item "$squishUrl\$squishArchive" "C:\Utils" +Copy-Item -Recurse "$testSuiteUrl" "C:\Utils" Verify-Checksum "C:\Utils\$squishArchive" $sha1 Extract-7Zip "C:\Utils\$squishArchive" "C:\Utils" -Rename-Item "$squishPackage" "$targetDir" + Remove-Item "C:\Utils\prebuild*" Write-Host "Verifying Squish Installation for following targets:" get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { $_.FullName } -get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "$targetDir\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } } +get-childitem "$targetDir" -Filter squishrunner.exe -Recurse | % { if (cmd /c $_.FullName --testsuite "C:\Utils\suite_test_squish" |Select-String -Pattern "Squish test run successfully") { Write-Host "Squish tested successfully"} else { [Environment]::Exit(1) } } |