diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 6f165e8b..09b5e0f3 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -47,19 +47,20 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.7.1" +version="6.7.2" qtBranch="62x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable" -licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" -licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" +licenseFile=".squish-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$licenseFile" +licenseSHA="bda9c3bce2b9a74cb10ead9e87a4ebacd9eef4c2" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" - sha1="1526d4d57f8025f83aad836a43e8fa0317dbddc2" + compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz" + sha1="6b7d80be4d107ba53ac9218fe5ca79f72c6e1e2d" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="d412c3389d95a65341b51d2e14cba47ce3b54a86" + sha1="1f57efd6f21a994b07f28b0b44ff7972bbf51733" fi mountFolder="/tmp/squish" @@ -101,7 +102,7 @@ sudo tar -xzf "$targetFileMount" --directory "$installFolder" echo "Unmounting $mountFolder" sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" -sudo mv "$installFolder/rta_squish_$version" "$squishFolder" +sudo mv "$installFolder/rta_squish_$qtBranch" "$squishFolder" if uname -a |grep -q Darwin; then sudo xattr -r -c "$squishFolder" fi @@ -114,11 +115,12 @@ if uname -a |grep -q "Ubuntu"; then fi fi -DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license" + +DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile" echo "Changing ownerships" sudo chown -R qt:$usersGroup "$squishFolder" -sudo chown qt:$usersGroup "$HOME/.squish-3-license" +sudo chown qt:$usersGroup "$HOME/$licenseFile" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8d36a267..0159ec64 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -42,15 +42,15 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.7-20210614-1625" -$qtBranch = "61x" +$version = "6.7.2" +$qtBranch = "62x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" -$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\515x" +$licenseUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\" # Squish license -$licensePackage = ".squish-3-license" +$licensePackage = ".squish-license" Write-Host "Installing Squish license to home directory" Copy-Item $licenseUrl\$licensePackage ~\$licensePackage @@ -67,7 +67,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 = "0ce4f94ebff488fedef29e9ed62b400a8b5014fb" + $sha1 = "3dd65fe3996bffd25892d5a7dfd2da26420a3f33" } } else { $winVersion = "n/a" @@ -78,6 +78,7 @@ Copy-Item "$squishUrl\$squishArchive" "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 }