mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-08 13:36:58 +02:00
Merge pull request #146 from kinvolk/jepio/azure-gen2-jenkins
add support for running tests on Azure Gen2 VMs
This commit is contained in:
commit
5138697cc9
@ -2,6 +2,7 @@ ami
|
||||
ami_vmdk
|
||||
ami_vmdk_pro
|
||||
azure
|
||||
azure_gen2
|
||||
azure_pro
|
||||
gce
|
||||
gce_pro
|
||||
|
@ -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
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user