mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #146 from kinvolk/jepio/azure-gen2-jenkins

Browse Source 
add support for running tests on Azure Gen2 VMs
This commit is contained in:
Jeremi Piotrowski 2021-08-27 11:42:09 +02:00 committed by GitHub
commit 5138697cc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
jenkins/formats-amd64-usr.txt
View File

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

1
jenkins/kola/azure.sh
View File

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

9
jenkins/vms.sh
View File

@ -85,6 +85,15 @@ if [[ "${FORMATS}" = "" ]]
then then
FORMATS="${FORMAT}" FORMATS="${FORMAT}"
fi 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 for FORMAT in ${FORMATS}; do
# If the format variable ends with _pro it's a Flatcar Pro image and it should # If the format variable ends with _pro it's a Flatcar Pro image and it should
# be uploaded to the private bucket. # be uploaded to the private bucket.