lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-06 00:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Provisioning: update Squish packages

Browse Source 
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2

Pick-to: 6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Tanja Remes
2021-06-21 08:31:05 +03:00
parent 9a029a5872
commit 1c17b656e0
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
coin/provisioning/common/unix/squishInstall.sh
View File

@@ -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"

6
coin/provisioning/common/windows/squishInstall.ps1
View File

@@ -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"