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: 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(-) (limited to 'coin/provisioning') 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" -- cgit v1.2.3 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: 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(-) (limited to 'coin/provisioning') 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 -- cgit v1.2.3 From 7c1c98e123c8b255c079b299d4e84680512396ca Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 2 Oct 2019 12:45:48 +0300 Subject: 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(+) (limited to 'coin/provisioning') 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 -- cgit v1.2.3 From e4f9ac5607a329bae045567a339d36469bc4fff6 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 8 Nov 2019 22:22:07 +0100 Subject: 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 --- .../provisioning/common/shared/testserver/docker_images.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'coin/provisioning') 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 -- cgit v1.2.3