diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2023-05-09 11:56:46 +0000 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-11-12 06:30:52 +0000 |
| commit | 814f9834dde64c9a5fbc0e2b0b7a506b3ee0a1a3 (patch) | |
| tree | 385c0956fb8f3cb6296ff8e641550373b0aed2fb | |
| parent | 6603139192d147e5e30f9c17e6a97b718042cbf3 (diff) | |
Provisioning: Ignore unmount result with Squish script
Unmounting fails sometimes which cause provisoning failure.
Let's ignore the result
Task-number: QTQAINFRA-3709
Change-Id: Ifc321c8ef9942f9f51ec622370aadbbbb862d262
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 2ae9a6c099476c9367c5e293058cd25722956c9a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | coin/provisioning/common/unix/squishInstall.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 87b066b4..a76bb734 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -100,7 +100,7 @@ echo "Uncompress $compressedFolder" sudo tar -xzf "$targetFileMount" --directory "$installFolder" echo "Unmounting $mountFolder" -sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" +sudo diskutil unmount force "$mountFolder" || sudo umount -f "$mountFolder" || true sudo mv "$installFolder/rta_squish_$qtBranch" "$squishFolder" if uname -a |grep -q Darwin; then |