mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 11:51:14 +02:00
ci-automation: Set the right parameters for Hyper-V Gen 1/2 on Azure
We still perform some tests using Gen 1 on amd64. Standard_D2s_v6 does not support this, but v5 will presumably be the last version that does, so hardcode that case. For Gen 2, you need to set the SKU for amd64 to work, and it has to use the gallery like arm64 already does. Using the gallery is possibly slightly slower, so ideally we would only upload the image once like we do for AWS, but let's just get it working for now. Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This commit is contained in:
parent
ef3e568a53
commit
54027d7488
@ -28,18 +28,20 @@ else
|
||||
rm "${AZURE_IMAGE_NAME}.bz2"
|
||||
fi
|
||||
|
||||
if [[ "${CIA_ARCH}" == "arm64" ]]; then
|
||||
AZURE_USE_GALLERY="--azure-use-gallery"
|
||||
fi
|
||||
|
||||
|
||||
run_kola_tests() {
|
||||
local instance_type="${1}"; shift
|
||||
local instance_tapfile="${1}"; shift
|
||||
local hyperv_gen="V2"
|
||||
local hyperv_gen sku
|
||||
|
||||
if [ "${instance_type}" = "V1" ]; then
|
||||
hyperv_gen="V1"
|
||||
instance_type="${azure_instance_type}"
|
||||
sku="alpha"
|
||||
# v5 is the last to support Gen 1. Only amd64 uses Gen 1.
|
||||
instance_type="Standard_D2s_v5"
|
||||
else
|
||||
hyperv_gen="V2"
|
||||
sku="alpha-gen2"
|
||||
set -- --azure-use-gallery "${@}"
|
||||
fi
|
||||
|
||||
# Align timeout with ore azure gc --duration parameter
|
||||
@ -54,6 +56,7 @@ run_kola_tests() {
|
||||
--azure-location="${AZURE_LOCATION}" \
|
||||
--tapfile="${instance_tapfile}" \
|
||||
--azure-size="${instance_type}" \
|
||||
--azure-sku="${sku}" \
|
||||
--azure-hyper-v-generation="${hyperv_gen}" \
|
||||
${AZURE_USE_GALLERY} \
|
||||
${AZURE_KOLA_VNET:+--azure-kola-vnet=${AZURE_KOLA_VNET}} \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user