diff options
| author | Tanja Remes <tanja.remes@qt.io> | 2021-06-21 08:31:05 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-22 14:14:08 +0000 |
| commit | e2877a3e5b1b0f12dd92fecc8af870a281030e2b (patch) | |
| tree | d6891f55541d9fc718c34d5685012430cfeb2009 | |
| parent | eea5f47027ea50670619904dd45b7bbbbb55af38 (diff) | |
Provisioning: update Squish packages
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 1c17b656e0c7b3f5fae598a0915fdebfeb822dae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 11 | ||||
| -rw-r--r-- | coin/provisioning/common/windows/squishInstall.ps1 | 6 |
2 files changed, 7 insertions, 10 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index cc3ad9e8..7efdc13e 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,23 +41,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-20210318-1241" -qtBranch="60x" +version="6.7-20210615-1349" +qtBranch="61x" 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" if uname -a |grep -q Darwin; then - #macOS package had to redo, so it's having same filename but different location to - #keep previous provisioning in working state - preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build/stable/6.7_rerun" version="6.7-20210301-1401" compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="e82701ffc1eb465dce3163ce7eab9ccaedc568c1" + sha1="15f7f8e9944fdc36b9b6e37576d6ca96713a8ac5" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="80b3f36e760963a6989a49c79818bf8671d1932a" + sha1="e32e5db1713e3050c3cdce696d7509c468afc7d3" fi mountFolder="/tmp/squish" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 2005864c..8f04e702 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,8 +36,8 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.7-20210319-0956" -$qtBranch = "60x" +$version = "6.7-20210614-1625" +$qtBranch = "61x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable" @@ -60,7 +60,7 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114" + $sha1 = "0ce4f94ebff488fedef29e9ed62b400a8b5014fb" } } else { $winVersion = "n/a" |