Switch installer task to EC2
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
This commit is contained in:
parent
ab5ca5b69c
commit
7bf9f302a3
14
.cirrus.yml
14
.cirrus.yml
|
|
@ -383,17 +383,23 @@ alt_build_task:
|
|||
win_installer_task:
|
||||
name: "Verify Win Installer Build"
|
||||
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:
|
||||
- alt_build
|
||||
windows_container:
|
||||
image: cirrusci/windowsservercore:2019
|
||||
ec2_instance:
|
||||
image: "${WINDOWS_AMI}"
|
||||
type: m5.large
|
||||
region: us-east-1
|
||||
platform: windows
|
||||
env:
|
||||
PATH: "${PATH};C:\\ProgramData\\chocolatey\\bin"
|
||||
CIRRUS_SHELL: powershell
|
||||
# Fake version, we are only testing the installer functions, so version doesn't matter
|
||||
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'
|
||||
main_script: '.\contrib\cirrus\win-installer-main.ps1'
|
||||
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function retryInstall {
|
|||
$pkg = @("--version", $Matches.2, $Matches.1)
|
||||
}
|
||||
|
||||
choco install -y $pkg
|
||||
choco install -y --allow-downgrade $pkg
|
||||
if ($LASTEXITCODE -eq 0) {
|
||||
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
|
||||
|
|
|
|||
Loading…
Reference in New Issue