Switch installer task to EC2

Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
This commit is contained in:
Jason T. Greene 2023-09-08 12:41:31 -05:00
parent ab5ca5b69c
commit 7bf9f302a3
2 changed files with 13 additions and 5 deletions

View File

@ -383,17 +383,23 @@ alt_build_task:
win_installer_task: win_installer_task:
name: "Verify Win Installer Build" name: "Verify Win Installer Build"
alias: win_installer alias: win_installer
only_if: *no_rhel_release only_if:
$CIRRUS_TAG == '' &&
$CIRRUS_BRANCH !=~ 'v[0-9\.]+-rhel' &&
$CIRRUS_BASE_BRANCH !=~ 'v[0-9\.]+-rhel'
depends_on: depends_on:
- alt_build - alt_build
windows_container: ec2_instance:
image: cirrusci/windowsservercore:2019 image: "${WINDOWS_AMI}"
type: m5.large
region: us-east-1
platform: windows
env: env:
PATH: "${PATH};C:\\ProgramData\\chocolatey\\bin" PATH: "${PATH};C:\\ProgramData\\chocolatey\\bin"
CIRRUS_SHELL: powershell CIRRUS_SHELL: powershell
# Fake version, we are only testing the installer functions, so version doesn't matter # Fake version, we are only testing the installer functions, so version doesn't matter
WIN_INST_VER: 9.9.9 WIN_INST_VER: 9.9.9
CIRRUS_WORKING_DIR: "${LOCALAPPDATA}\\Temp\\cirrus-ci-build" CIRRUS_WORKING_DIR: "${LOCALAPPDATA}\\cirrus-ci-build"
install_script: '.\contrib\cirrus\win-installer-install.ps1' install_script: '.\contrib\cirrus\win-installer-install.ps1'
main_script: '.\contrib\cirrus\win-installer-main.ps1' main_script: '.\contrib\cirrus\win-installer-main.ps1'

View File

@ -13,7 +13,7 @@ function retryInstall {
$pkg = @("--version", $Matches.2, $Matches.1) $pkg = @("--version", $Matches.2, $Matches.1)
} }
choco install -y $pkg choco install -y --allow-downgrade $pkg
if ($LASTEXITCODE -eq 0) { if ($LASTEXITCODE -eq 0) {
break break
} }
@ -22,4 +22,6 @@ function retryInstall {
} }
} }
} }
# Force mingw version 11.2 since later versions are incompatible
# with CGO on some versions of golang
retryInstall wixtoolset mingw@11.2 golang archiver retryInstall wixtoolset mingw@11.2 golang archiver