From 814f9834dde64c9a5fbc0e2b0b7a506b3ee0a1a3 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 9 May 2023 11:56:46 +0000 Subject: [PATCH] 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 (cherry picked from commit 2ae9a6c099476c9367c5e293058cd25722956c9a) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/squishInstall.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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