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 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'coin/provisioning/common/unix') 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/" -- 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/common/unix') 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