From 08ded9e2f87c3313354e578c3eefb6d95c2385e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Wed, 16 Oct 2019 11:51:00 +0300 Subject: [PATCH 1/7] Provisioning: update Squish Update with custom build of Squish to be able to launch Qt5.14 applications in RTA tests. Change-Id: Ic420656852ae885b057de937baabf01135526764 Reviewed-by: Jani Heikkinen --- coin/provisioning/common/unix/squishInstall.sh | 8 ++++---- coin/provisioning/common/windows/squishInstall.ps1 | 10 +++------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index f1b5e6b5..24a4d507 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,14 +38,14 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.4.3" +version="6.5" # Branch version without dot -qtBranch="512x" +qtBranch="513x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" -squishFile="squish-$version-qt$qtBranch-linux64.run" +squishFile="squish-nosignalhandler-$version-qt$qtBranch-linux64.run" if uname -a |grep -q Darwin; then - squishFile="squish-$version-qt$qtBranch-macx86_64.dmg" + squishFile="squish-nosignalhandler-$version-qt$qtBranch-macx86_64.dmg" fi squishLicenseUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 2cc45785..f8d600d7 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,10 +38,10 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.4.3" +$version = "6.5" # Qt branch without dot (*.*) -$qtBranch = "512x" +$qtBranch = "513x" # So far Squish built with Qt5.12 works also with 5.13, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. @@ -62,11 +62,7 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 - if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { - $qtBranch = "511x" - } - $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" + $SquishUrl = $squishBranchUrl + "\squish-nosignalhandler-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" From 9cf8af52484ea5e80cec9a56c2d9e841bb44184e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 20 Nov 2019 15:28:30 +0200 Subject: [PATCH 2/7] Provisioning: Remove sudo when installing pip packages for Qt user There is no need to install as sudo for qt user. Using sudo will change the cache dir's permissions preventing us from installing anything with pip as normal user. Change-Id: Id45bf3805ce4d772a6c82e429d4e1948289f076e Reviewed-by: Friedemann Kleint --- coin/provisioning/common/unix/python_modules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/python_modules.sh b/coin/provisioning/common/unix/python_modules.sh index dbf26a85..89adbd5c 100755 --- a/coin/provisioning/common/unix/python_modules.sh +++ b/coin/provisioning/common/unix/python_modules.sh @@ -34,5 +34,5 @@ ############################################################################# # needed by packaging scripts -sudo pip3 install bs4 -sudo pip3 install sh +pip3 install bs4 +pip3 install sh From f064a5b9d2ec45187157adb6b2194e564fbaca8b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 26 Nov 2019 08:11:17 +0100 Subject: [PATCH 3/7] Update submodules on '5.14' in qt/qt5 Change-Id: I75cd18c8c09c47c2eee8dd0629d1cccb3b5838e0 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index 54f5b897..84892e5e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 54f5b8975055f1d48c74efab085acd6338aa1e3c +Subproject commit 84892e5e69e7e44cb1fb77b2ba2338114554a7d2 diff --git a/qtdeclarative b/qtdeclarative index 35fdf3a7..92481660 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 35fdf3a7b77a79806d0b5d9632b5066e3618adf5 +Subproject commit 9248166095b1e3383a43f106219e888b6d43b7d6 diff --git a/qtdoc b/qtdoc index 2f81a81a..1e27737f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2f81a81aac5b6f47e3d40974912917473171597d +Subproject commit 1e27737f9e341c6d53dd8a92c2505996c96e3b7d diff --git a/qtqa b/qtqa index b9a30637..0f6a737c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b9a306372a17a22e1907bbd5911f819d4911bb87 +Subproject commit 0f6a737ca798ae9c8e0c634715c5cb66681a278a diff --git a/qtquick3d b/qtquick3d index 67458dbc..2c7d2d46 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 67458dbc14f3c319976f62a781ce88044fc3e8b3 +Subproject commit 2c7d2d46bd4ac2cc203be586a760a8f9bc2ac69e diff --git a/qtquickcontrols b/qtquickcontrols index 5d76ced0..dfd79afd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5d76ced033cf1b2a1466a1b1b2a3a4f1102fab3f +Subproject commit dfd79afda5faf9e732f83715e11dc7aaf5cce164 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2193e993..f9877da4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2193e9938e98af39a16f5035789c555f2574020b +Subproject commit f9877da406ad96d82becb15b6eef9b723b8807e3 diff --git a/qtquicktimeline b/qtquicktimeline index a5c44aee..02b8928d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a5c44aee2d92ed607ce1fc38910d35bd2df5ce9c +Subproject commit 02b8928d42398f963f98e2fa526d14f04f3db429 diff --git a/qtrepotools b/qtrepotools index 0028759f..a3d6e9d3 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0028759fdab4f2a5d59b1ec3cfc34d2c992e9d94 +Subproject commit a3d6e9d3965ae4d4f97986982b851ef30d091fd5 diff --git a/qtserialbus b/qtserialbus index 545494c6..e333d015 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 545494c6e7c2441f7fc8c6b7e337189461938b00 +Subproject commit e333d015458b579768ca229918a3ed426f0e4029 diff --git a/qttools b/qttools index 2b6c9031..8437ead5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2b6c90317b6bc5f94ca0dc14a3a1467aa8019b17 +Subproject commit 8437ead59e73007f05346068ff0979352488a218 diff --git a/qtwayland b/qtwayland index ca8a6e6e..c327759b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ca8a6e6ee1c2439dbe439244b61f86cf062f88d5 +Subproject commit c327759b8f1c8fcb6ec70b4266092a38fd1375f6 diff --git a/qtwebchannel b/qtwebchannel index 48ceec6d..b2685b64 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 48ceec6ddb790730a23b5bee847bea5273300103 +Subproject commit b2685b64d1f2fef2ef1f3f3542379fb8f052d113 diff --git a/qtwebengine b/qtwebengine index ce72a40e..aca2a6df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ce72a40e91095dd5e1e46713fb94de493ee48d39 +Subproject commit aca2a6df402d6454c7bbe8b0e9816645fcec8342 diff --git a/qtwebglplugin b/qtwebglplugin index 63a47ff1..ef0f5f5e 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 63a47ff1f83c64e6865edd61657ad1d636fcae23 +Subproject commit ef0f5f5ed8cdb6dd70f728fd1873158785f43d27 From 56ad797f426055ceeaf0fc5262d5b04eedbded0c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 26 Nov 2019 19:53:26 +0100 Subject: [PATCH 4/7] Update submodules on '5.14' in qt/qt5 Change-Id: Iaeaf6014ff94eef81ebba7db5ae3de5fa1c4cc2f Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 31d3ebed..2fffced2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 31d3ebed75387b09645fe3f1d36e3b30f686fce3 +Subproject commit 2fffced20a8bef503d0f9f981e785c5b2692487d diff --git a/qtbase b/qtbase index 84892e5e..da0af1e2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 84892e5e69e7e44cb1fb77b2ba2338114554a7d2 +Subproject commit da0af1e21de6eda849dacf0283c78fbd36fd4f3f diff --git a/qtdeclarative b/qtdeclarative index 92481660..0012f8bd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9248166095b1e3383a43f106219e888b6d43b7d6 +Subproject commit 0012f8bd152a36a67abc696465f27d612625b5d9 diff --git a/qtdoc b/qtdoc index 1e27737f..ac241949 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1e27737f9e341c6d53dd8a92c2505996c96e3b7d +Subproject commit ac241949096b7ec655dc34d964bd627f1438484d diff --git a/qtmultimedia b/qtmultimedia index 49bf444b..d986420f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 49bf444b44dac10602af0af862f0951835ea5895 +Subproject commit d986420f3f35d096014ca67f6c40fc3c757091f7 diff --git a/qtquick3d b/qtquick3d index 2c7d2d46..3bdcfe5d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2c7d2d46bd4ac2cc203be586a760a8f9bc2ac69e +Subproject commit 3bdcfe5d2d454d226e74d9ed57d9a262bb681952 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6547842b..462a024e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6547842b5ec6f3f13dc0d9fec6c8e4d167bfb2ce +Subproject commit 462a024e4101d54490b5da26c5fec7818beb5253 diff --git a/qtwayland b/qtwayland index c327759b..09861f00 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c327759b8f1c8fcb6ec70b4266092a38fd1375f6 +Subproject commit 09861f0081e6729383808ac4803c7fd1f0ba6dd1 From b3da33310167cc86a5bd4243dabcd1956a8b9b40 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Dec 2019 22:30:51 +0100 Subject: [PATCH 5/7] Update submodules on '5.14' in qt/qt5 Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 2fffced2..b6923f6f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2fffced20a8bef503d0f9f981e785c5b2692487d +Subproject commit b6923f6fa0c01fa47f99f9794a17fe99c5397680 diff --git a/qtbase b/qtbase index da0af1e2..0f812db5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit da0af1e21de6eda849dacf0283c78fbd36fd4f3f +Subproject commit 0f812db558df072a411ade3305b796d54bccd996 diff --git a/qtdeclarative b/qtdeclarative index 0012f8bd..991035ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0012f8bd152a36a67abc696465f27d612625b5d9 +Subproject commit 991035ea1f00671d79c340a8a5c038e6aae1ece7 diff --git a/qtqa b/qtqa index 0f6a737c..556798f8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0f6a737ca798ae9c8e0c634715c5cb66681a278a +Subproject commit 556798f875e5501a7322c1cc571701b52c851449 diff --git a/qtquick3d b/qtquick3d index 3bdcfe5d..b864811e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 3bdcfe5d2d454d226e74d9ed57d9a262bb681952 +Subproject commit b864811e6bc4d6da9458db253c0e2fb2f60db3d5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f9877da4..8ee511bc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f9877da406ad96d82becb15b6eef9b723b8807e3 +Subproject commit 8ee511bcd9f1376e9995ab3f30f6415ad60b7c05 diff --git a/qtquicktimeline b/qtquicktimeline index 02b8928d..3ca22174 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 02b8928d42398f963f98e2fa526d14f04f3db429 +Subproject commit 3ca22174ea5b1fecf9ec8341cdf3e909a2bc89f8 diff --git a/qtrepotools b/qtrepotools index a3d6e9d3..fa4ab96e 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a3d6e9d3965ae4d4f97986982b851ef30d091fd5 +Subproject commit fa4ab96e757b72096b5e67fd636e128f8d8afe83 diff --git a/qttools b/qttools index 8437ead5..0b0e82d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8437ead59e73007f05346068ff0979352488a218 +Subproject commit 0b0e82d80adb9dd57bd4a2aa7508c6a4caa8acc1 diff --git a/qtwayland b/qtwayland index 09861f00..ce06115d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 09861f0081e6729383808ac4803c7fd1f0ba6dd1 +Subproject commit ce06115da6bf4c8d891ff0aa382dd2b1f5b4bf65 diff --git a/qtwebengine b/qtwebengine index aca2a6df..cc2b1d2b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit aca2a6df402d6454c7bbe8b0e9816645fcec8342 +Subproject commit cc2b1d2b66806a67f13996cbb8631d5ea8cdf71a diff --git a/qtwebglplugin b/qtwebglplugin index ef0f5f5e..47bd603d 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ef0f5f5ed8cdb6dd70f728fd1873158785f43d27 +Subproject commit 47bd603dba7c1d66871646f309407976aafe2f6b From 7c1c98e123c8b255c079b299d4e84680512396ca Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 2 Oct 2019 12:45:48 +0300 Subject: [PATCH 6/7] Provisioning: Install libpoppler Poppler test requires this package Task-number: QTQAINFRA-3253 Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1 Reviewed-by: Michal Klocek --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 89b1eb7f..d5f9ef7a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -169,6 +169,8 @@ installPackages+=(git-lfs) installPackages+=(chrpath) installPackages+=(gawk) installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) echo "Running update for apt" waitLoop From e4f9ac5607a329bae045567a339d36469bc4fff6 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 8 Nov 2019 22:22:07 +0100 Subject: [PATCH 7/7] Tag the docker images as "latest" We will use this tag in qtbase to refer to the image to run, because with the current sha1tree() tag, every minor change in the docker images requires synchronized changes between repositories. Task-number: QTBUG-79867 Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c Reviewed-by: Volker Hilsheimer --- .../common/shared/testserver/docker_images.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh index e98183d8..1d467f7b 100755 --- a/coin/provisioning/common/shared/testserver/docker_images.sh +++ b/coin/provisioning/common/shared/testserver/docker_images.sh @@ -51,18 +51,20 @@ sha1tree () { sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1 } -# Using SHA-1 of each server context as the tag of docker images. A tag labels a -# specific image version. It is used by docker compose file (docker-compose.yml) -# to launch the corresponding docker containers. If one of the server contexts -# (./apache2, ./danted, ...) gets changes, all the related compose files in -# qtbase should be updated as well. +# A tag labels a specific image version. In the docker compose file +# (docker-compose.yml) that launches the containers, the tag used is +# "latest". Here the images are also tagged with the SHA1 of each server +# context, so if needed we can modify docker-compose.yml to launch a very +# specific image, thus providing a way to stage backwards-incompatible changes +# across repositories. source "$SERVER_PATH/settings.sh" for server in $testserver do context="$SERVER_PATH/$server" - docker build -t qt-test-server-$server:$(sha1tree $context) $context + tag=$(sha1tree $context) + docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context done docker images