From 836d04de24a0e953367ceec9b88eb3a4d2d64b8b Mon Sep 17 00:00:00 2001
From: Chris Evich <cevich@redhat.com>
Date: Thu, 28 Sep 2023 10:53:11 -0400
Subject: [PATCH] Add windows packages needed for podman CI

Also increase windows build timeout since the extra packages seem to
place it right on the timeout-edge.

Signed-off-by: Chris Evich <cevich@redhat.com>
---
 .cirrus.yml                  |  1 -
 IMG_SFX                      |  2 +-
 win_images/win_packaging.ps1 | 15 +++++++++++----
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index f2ecd998..3cecf877 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -272,7 +272,6 @@ win_images_task:
     # Packer needs time to clean up partially created VM images
     auto_cancellation: $CI != "true"
     stateful: true
-    timeout_in: 45m
     # Packer WinRM communicator is not reliable on container tasks
     gce_instance:
         <<: *ibi_vm
diff --git a/IMG_SFX b/IMG_SFX
index 95b4b769..26cc0de3 100644
--- a/IMG_SFX
+++ b/IMG_SFX
@@ -1 +1 @@
-20230928t004553z-f39f38d13
+20230928t184402z-f39f38d13
diff --git a/win_images/win_packaging.ps1 b/win_images/win_packaging.ps1
index 540cbef7..991fccb2 100644
--- a/win_images/win_packaging.ps1
+++ b/win_images/win_packaging.ps1
@@ -1,3 +1,4 @@
+
 function CheckExit {
   param(
     [parameter(ValueFromRemainingArguments = $true)]
@@ -16,7 +17,6 @@ function CheckExit {
   Exit $LASTEXITCODE
 }
 
-
 # Disables runtime process virus scanning, which is not necessary
 Set-MpPreference -DisableRealtimeMonitoring 1
 $ErrorActionPreference = "stop"
@@ -25,11 +25,18 @@ Set-ExecutionPolicy Bypass -Scope Process -Force
 [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072
 iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 
-# Install Git, BZ2 archive support, Go, and the MingW (GCC for Win) compiler for CGO support
-# Add pstools to workaorund sess 0 WSL bug
-choco install -y git mingw archiver psexec; CheckExit
+# Install Git, BZ2 archive support, Go, and the MingW (GCC for Win)
+# compiler for CGO support.  Force mingw version 11.2 since later
+# versions are/may-be incompatible with CGO.  Add pstools to
+# workaorund sess 0 WSL bug.
+choco install -y git mingw@11.2 archiver psexec; CheckExit
 choco install golang --version 1.19.2 -y; CheckExit
 
+# Install wixtoolset for installer build & test.
+# Update service is required for dotnet 3.5 (dep of wix)
+Set-Service -Name wuauserv -StartupType "Manual"; CheckExit
+choco install -y wixtoolset; CheckExit
+
 # Install Hyper-V
 Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All -NoRestart