diff options
| author | Heikki Halmet <heikki.halmet@qt.io> | 2020-07-02 12:57:06 +0300 |
|---|---|---|
| committer | Heikki Halmet <heikki.halmet@qt.io> | 2020-08-23 14:30:04 +0300 |
| commit | 48dd29987faa69f798029d6b383348b15e908e2d (patch) | |
| tree | 221a1508a1a6141bb0eb300a10f66c1ceaa47ed8 | |
| parent | e8dcff8a25a8d3ec7630090d06a5b6e001240561 (diff) | |
Provisioning: Add more sleep to msys2 installation
Latest Windows 10 v2004 needs more sleep for msys2 installation so that
gpg-agent will be killed after the installation process is finished.
Otherwise the provisioning won't continue and it will fail to timeout.
Task-number: QTQAINFRA-3691
Change-Id: I8b214415e777845e9ff711c1de9b09553b715d92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
| -rw-r--r-- | coin/provisioning/common/windows/install-msys2.ps1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/windows/install-msys2.ps1 b/coin/provisioning/common/windows/install-msys2.ps1 index 784b09dc..78437129 100644 --- a/coin/provisioning/common/windows/install-msys2.ps1 +++ b/coin/provisioning/common/windows/install-msys2.ps1 @@ -63,12 +63,12 @@ $msys = "$TargetLocation\$folder\msys2_shell.cmd" # install perl # Run these without 'Run-Executable' function. When using the function the gpg-agent will lock the needed tmp*.tmp file. cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacman-key --populate msys2;pacman -S --noconfirm perl make`"" -Start-Sleep -s 30 -cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`"" +Start-Sleep -s 60 +cmd /c "$msys `"-l`" `"-c`" `"echo y | 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 +Start-Sleep -s 360 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 } |