aboutsummaryrefslogtreecommitdiffstats
path: root/coin/provisioning/common/windows
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2020-04-28 14:53:47 +0300
committerHeikki Halmet <heikki.halmet@qt.io>2020-04-30 11:05:15 +0300
commit5f03b84e6542f00cf9eccd1d8820f423cee5e2b9 (patch)
tree4528cec22619349bc49267ae89247345c2e94a02 /coin/provisioning/common/windows
parent20668c9233846b48409b1d983847b805e130e328 (diff)
Provisioning: Add sleep before killing gpg-agent in msys installation
Task-number: QTQAINFRA-3691 Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920 Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin/provisioning/common/windows')
-rw-r--r--coin/provisioning/common/windows/install-msys2.ps13
1 files changed, 3 insertions, 0 deletions
diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1
index b26df151..784b09dc 100644
--- a/coin/provisioning/common/windows/install-msys2.ps1
+++ b/coin/provisioning/common/windows/install-msys2.ps1
@@ -66,6 +66,9 @@ cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacma
Start-Sleep -s 30
cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
+# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
+# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
+Start-Sleep -s 180
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }