From 23a05949c1e2816fc8532803f0a981d4c5812af9 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Wed, 3 Aug 2022 16:22:38 +0200 Subject: [PATCH] ci-automation/vendor-testing/azure.sh: Use proper machine size on arm64 --- ci-automation/ci-config.env | 4 ++-- ci-automation/vendor-testing/azure.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env index e418c06d2e..8347653dc3 100644 --- a/ci-automation/ci-config.env +++ b/ci-automation/ci-config.env @@ -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"} diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh index 745f0bb88c..0fe91b1073 100755 --- a/ci-automation/vendor-testing/azure.sh +++ b/ci-automation/vendor-testing/azure.sh @@ -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/}