diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2020-05-05 08:28:51 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-06-10 07:24:41 +0300 |
| commit | 2c0816aa9927b0b9a80f23945f8516306f7329c6 (patch) | |
| tree | 0568fe2664d50e0501338129e1079803a9640ab7 | |
| parent | 122cf4cc0ea3433512d58937d483d42717892d51 (diff) | |
Provisioning: Change mounting folder for Squish installation
Sometimes some process is locking the mounted folder (/tmp) so that
it can't be unmounted untill the process has been ended.
Let's create squish folder under tmp and use that for mounting
instead
Task-number: QTQAINFRA-3709
Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c671c2352e1db453da17d346316acfa627617786)
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index a0c23350..7592814b 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -55,22 +55,21 @@ else sha1="63f33de55770e2588dd9f482546900e33d20f8ec" fi +mountFolder="/tmp/squish" +sudo mkdir "$mountFolder" + # Check which platform if uname -a |grep -q Darwin; then usersGroup="staff" - mountFolder="/Volumes" squishLicenseDir="/Users/qt" elif uname -a |grep -q "el7"; then usersGroup="qt" - mountFolder="/tmp" squishLicenseDir="/root" elif uname -a |grep -q "Ubuntu"; then usersGroup="users" - mountFolder="/tmp" squishLicenseDir="/home/qt" else usersGroup="users" - mountFolder="/tmp" squishLicenseDir="/root" fi |