From ba6d7235a17752858a76780d9060608183b2b186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Thu, 25 Mar 2021 08:20:45 +0200 Subject: [PATCH 1/2] Provisioning: update Squish packges Still using unreleased custom snapshot packages from Froglogic. macOS: use custom build Qt5.15 package with separate Squish server adjusted for Qt6. Change-Id: I8605204118015feb347268c335ef731ff99e3c68 Reviewed-by: Heikki Halmet (cherry picked from commit 02d4c34b7da7d0d885b79528276aa1e596c257c3) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/unix/squishInstall.sh | 45 ++++++++----------- .../common/windows/squishInstall.ps1 | 15 +++---- 2 files changed, 24 insertions(+), 36 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index a189ea87..6de8116d 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -41,7 +41,7 @@ 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-20210119-1632" +version="6.7-20210318-1241" qtBranch="60x" installFolder="/opt" squishFolder="$installFolder/squish" @@ -49,12 +49,12 @@ preBuildCacheUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/jenkins_build licenseUrl="http://ci-files01-hki.intra.qt.io/input/squish/coin/515x/.squish-3-license" licenseSHA="e000d2f95b30b82f405b9dcbeb233cd43710a41a" if uname -a |grep -q Darwin; then - version="6.6.1" - compressedFolder="prebuild-squish-$version-515x-macx86_64.tar.gz" - sha1="9fff9a7cb037214d21f47f2cc53747885fd1f2ae" + version="6.7-20210301-1401" + compressedFolder="prebuild-squish-$version-$qtBranch-macx86_64.tar.gz" + sha1="562d065ed810f03cb0dad4cf81a4fc688bc813ec" else compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="8780665c3560456cd86980802cb24513233444fe" + sha1="80b3f36e760963a6989a49c79818bf8671d1932a" fi mountFolder="/tmp/squish" @@ -113,31 +113,24 @@ if uname -a |grep -q "Ubuntu"; then echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.profile echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.profile else - echo "export SQUISH_PATH=$squishFolder/squish_for_qt" >> ~/.bashrc - echo "export PATH=\$PATH:$squishFolder/squish_for_qt/bin" >> ~/.bashrc + echo "export SQUISH_PATH=$squishFolder/squish_for_qt6" >> ~/.bashrc + echo "export PATH=\$PATH:$squishFolder/squish_for_qt6/bin" >> ~/.bashrc fi echo "Verifying Squish, available installations:" ls -la $squishFolder -if uname -a |grep -q Darwin; then - 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 for Qt test failed! Package wasn't installed correctly." - exit 1 - fi + +if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt5 installation tested successfully" else - if "$squishFolder/squish_for_qt5/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt5 installation tested successfully" - else - echo "Squish for Qt5 test failed! Package wasn't installed correctly." - exit 1 - fi - if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then - echo "Squish for Qt6 installation tested successfully" - else - echo "Squish for Qt6 test failed! Package wasn't installed correctly." - exit 1 - fi + echo "Squish for Qt5 test failed! Package wasn't installed correctly." + exit 1 +fi +if "$squishFolder/squish_for_qt6/bin/squishrunner" --testsuite "$squishFolder/suite_test_squish" | grep "Squish test run successfully" ; then + echo "Squish for Qt6 installation tested successfully" +else + echo "Squish for Qt6 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 dbd6da16..2005864c 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -36,7 +36,7 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "6.7-20210112-1612" +$version = "6.7-20210319-0956" $qtBranch = "60x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" @@ -50,7 +50,7 @@ Write-Host "Installing Squish license to home directory" Copy-Item $licenseUrl\$licensePackage ~\$licensePackage if (Is64BitWinHost) { - $arch = "x64" + $arch = "x64" } else { $arch = "x86" } @@ -60,15 +60,10 @@ $OSVersion = (get-itemproperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\Curren if ($OSVersion -eq "Windows 10 Enterprise") { $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "628bb65cf515d08df388b0dc4d5b403e4c6657b2" - } else { - $sha1 = "9c0fc186605522ac0ac11066c10c3f3e8a95a705" - #Remove special handling when all packages are in same dir, exception now for win10 x86->the archive had to be rebuild - $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\jenkins_build\stable\6.6.1_rerun" + $sha1 = "61eca4950d24d9780e02cd4183c54009eda46114" } -} elseif ($OSVersion -eq "Windows 7 Enterprise") { - $winVersion = "win7" - $sha1 = "ec890c16bb671ae79b093ba81e6567d2780f85a2" +} else { + $winVersion = "n/a" } $squishArchive = "prebuild-squish-$version-$qtBranch-$winVersion-$arch.zip" From 9f5f38167305be36f2ab350e04ae8148e7a9e3cc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 29 Mar 2021 08:29:43 +0300 Subject: [PATCH 2/2] Update submodules on '6.0' in qt/qt5 Change-Id: Iba76968d0845b67082705a6fe523407d03c2ba41 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index f8b18d7e..ca8a9858 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f8b18d7e03e24c7b96cfe8c35cd80ed40169ec98 +Subproject commit ca8a985871e50d292d475ed10da423dd7020a914 diff --git a/qtdoc b/qtdoc index d3d38809..42f2efca 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d3d38809112e69c4136cf1f857469201b9d2c80e +Subproject commit 42f2efcae09344c2ad99cc54b1baa93943110871 diff --git a/qtqa b/qtqa index 6a6c9e09..dd18d63a 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 6a6c9e090e91acc83901e6c619f130130e0ea796 +Subproject commit dd18d63a85d76f2305850162640a68055101fb8f diff --git a/qtquick3d b/qtquick3d index 4b64d2a4..f041a36f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4b64d2a419a340ded04dd83722fbcb248b932b9e +Subproject commit f041a36f63ea96c0208f7f13ec7741b77d59fe5d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 71512cca..95c33ac9 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 71512cca5605ce76f00ec33212886792a9ab987b +Subproject commit 95c33ac9f837d05cffce4281d95ebee532413948 diff --git a/qtquicktimeline b/qtquicktimeline index 8fc053c4..551dc9f6 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8fc053c4508a41b69fc936aa4a33e71678427029 +Subproject commit 551dc9f6c89d173791feb18763a83d13f9a68ce8 diff --git a/qttools b/qttools index c8f2ef09..c7575a14 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c8f2ef09c12adfdc42561bbf6938f6d67fbed789 +Subproject commit c7575a145ee1ab62ef2fe38719a964781bc0ac2c diff --git a/qttranslations b/qttranslations index 653d5962..537c8e62 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 653d596295bb735f0d13fcbbb04a51d32d841e71 +Subproject commit 537c8e6272a3730a428777bccb9ceb72831ab61f diff --git a/qtwayland b/qtwayland index a5889bc4..f39a9bb5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a5889bc4e8d91f47b097431990bb25377ec49c2e +Subproject commit f39a9bb510d7ae41694b7408cbcac96da4d548ac