jenkins: add support for running tests on Azure Gen2 VMs

This requires passing the --azure-hyper-v-generation=V2 argument to kola. The
vhd/image is the same as for azure gen1 vms, the azure_gen2 specifier is only
for jenkins usage.

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2021-08-26 19:12:47 +02:00
parent a091274a76
commit a2b3950ac2
3 changed files with 11 additions and 0 deletions

View File

@ -2,6 +2,7 @@ ami
ami_vmdk
ami_vmdk_pro
azure
azure_gen2
azure_pro
gce
gce_pro

View File

@ -43,5 +43,6 @@ timeout --signal=SIGQUIT 20h bin/kola run \
--tapfile="${JOB_NAME##*/}.tap" \
--torcx-manifest=torcx_manifest.json \
${AZURE_MACHINE_SIZE_OPT} \
${AZURE_HYPER_V_GENERATION:+--azure-hyper-v-generation=${AZURE_HYPER_V_GENERATION}} \
${KOLA_TESTS}
set +o noglob

View File

@ -85,6 +85,15 @@ if [[ "${FORMATS}" = "" ]]
then
FORMATS="${FORMAT}"
fi
if [[ "${FORMATS}" == *"azure_gen2"* ]] ; then
# azure_gen2 shares an image with azure
if [[ " ${FORMATS} " != *" azure "* ]]; then
FORMATS+=" azure"
fi
FORMATS=${FORMATS/azure_gen2/}
fi
for FORMAT in ${FORMATS}; do
# If the format variable ends with _pro it's a Flatcar Pro image and it should
# be uploaded to the private bucket.