ci-automation/vendor-testing/azure.sh: Use proper machine size on arm64

This commit is contained in:
Krzesimir Nowak 2022-08-03 16:22:38 +02:00
parent 4d09ab35d6
commit 23a05949c1
2 changed files with 4 additions and 3 deletions

View File

@ -122,8 +122,8 @@ AWS_PARALLEL="${PARALLEL_TESTS:-8}"
# -- Azure --
: ${AZURE_IMAGE_NAME:="flatcar_production_azure_image.vhd"}
: ${AZURE_MACHINE_SIZE:="Standard_D2s_v4"}
: ${AZURE_MORE_MACHINE_SIZE:="Standard_D2s_v4"}
: ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v4"}
: ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v5"}
: ${AZURE_USE_GALLERY:=""}
: ${AZURE_USE_PRIVATE_IPS:=true}
: ${AZURE_VNET_SUBNET_NAME:="jenkins-vnet-westeurope"}

View File

@ -14,7 +14,8 @@ source ci-automation/vendor_test.sh
board="${CIA_ARCH}-usr"
basename="ci-${CIA_VERNUM//+/-}-${CIA_ARCH}"
azure_instance_type="${AZURE_MACHINE_SIZE}"
azure_instance_type_var="AZURE_${CIA_ARCH}_MACHINE_SIZE"
azure_instance_type="${!azure_instance_type_var}"
azure_vnet_subnet_name="jenkins-vnet-${AZURE_LOCATION}"
IS_AMD64=${CIA_ARCH//arm64/}