From 784af12d4cd14cc9ec2e8a27ff52a7880091e574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 7 Aug 2020 14:06:50 +0300 Subject: Provisioning: update Squish to 6.6.1 based on Qt5.15.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Squish for Web installation, update Squish license. Pick-to:5.15 Change-Id: Id418830e82718afc20ac7390400342a6b0401a64 Reviewed-by: Heikki Halmet (cherry picked from commit 91c267a67758db507d412861b6feedc763ad23e7) Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/squishInstall.sh | 29 +++++++++++----------- coin/provisioning/common/windows/squishInstall.ps1 | 10 ++++---- 2 files changed, 20 insertions(+), 19 deletions(-) (limited to 'coin') diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 7592814b..bce68549 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,18 +41,19 @@ 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.5.2" -qtBranch="514x" +version="6.6.1" +qtBranch="515x" 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/.squish-3-license" +licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/$qtBranch/.squish-3-license" +licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" - sha1="91a1d7228dc4b4bd64f93191c33d2642abc97e14" + sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="63f33de55770e2588dd9f482546900e33d20f8ec" + sha1="3a50052caafa3ca583b7edf754227999d7185ffa" fi mountFolder="/tmp/squish" @@ -95,11 +96,11 @@ sudo mv "$installFolder/rta_squish_$version" "$squishFolder" if uname -a |grep -q "Ubuntu"; then if [ ! -e "/usr/lib/tcl8.6" ]; then sudo mkdir /usr/lib/tcl8.6 - sudo cp "$squishFolder/package/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ + sudo cp "$squishFolder/squish_for_qt/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ fi fi -DownloadURL "$licenseUrl" "$licenseUrl" "3c6b2b3ca047f68e20f697afcc3a9d376f01b376" "$HOME/.squish-3-license" +DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/.squish-3-license" echo "Changing ownerships" sudo chown -R qt:$usersGroup "$squishFolder" @@ -107,18 +108,18 @@ sudo chown qt:$usersGroup "$HOME/.squish-3-license" echo "Set commands for environment variables in .bashrc" if uname -a |grep -q "Ubuntu"; then - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.profile - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.profile + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.profile + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.profile else - echo "export SQUISH_PATH=$squishFolder/package" >> ~/.bashrc - echo "export PATH=\$PATH:$squishFolder/squish-$version/bin" >> ~/.bashrc + echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc fi echo "Verifying Squish" -if "$squishFolder/package/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish installation tested successfully" +if "$squishFolder/squish_for_qt/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt installation tested successfully" else - echo "Squish test failed! Package wasn't installed correctly." + echo "Squish for Qt test failed! Package wasn't installed correctly." exit 1 fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8396743e..518de783 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.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" @@ -60,13 +60,13 @@ $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 = "1e6c1b3935e1c1bcdd28ec2511f24b8656d3ee6a" } } elseif ($OSVersion -eq "Windows 7 Enterprise") { $winVersion = "win7" - $sha1 = "01b3529459da948cfde319d60becc666da0e1c4d" + $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" -- cgit v1.2.1