From 7f5282e2599497464c4f68c101428bae3c8cdb67 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 3 Aug 2022 15:12:15 +0200
Subject: [PATCH 1/4] ci-automation/vendor-testing/azure.sh: Fix hyperv
 generation argument

The "v" must be a capital letter. It seems that Azure got picker about
parameters it accepts.
---
 ci-automation/vendor-testing/azure.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh
index 4b1ff7ad71..c7bf801a57 100755
--- a/ci-automation/vendor-testing/azure.sh
+++ b/ci-automation/vendor-testing/azure.sh
@@ -41,9 +41,9 @@ fi
 run_kola_tests() {
     local instance_type="${1}"; shift
     local instance_tapfile="${1}"; shift
-    local hyperv_gen="v2"
-    if [ "${instance_type}" = "v1" ]; then
-        hyperv_gen="v1"
+    local hyperv_gen="V2"
+    if [ "${instance_type}" = "V1" ]; then
+        hyperv_gen="V1"
         instance_type="${azure_instance_type}"
     fi
 
@@ -78,7 +78,7 @@ run_kola_tests_on_instances \
     "${azure_instance_type}" \
     "${CIA_TAPFILE}" \
     "${CIA_FIRST_RUN}" \
-    ${IS_AMD64:+v1} \
+    ${IS_AMD64:+V1} \
     '--' \
     'cl.internet' \
     '--' \

From 4d09ab35d68df4e1e4d2e0a41930fc9bb871853f Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 3 Aug 2022 15:18:57 +0200
Subject: [PATCH 2/4] ci-automation/vendor-testing/azure.sh: Fix unbound
 variable use

This gets triggered when the test is rerun and an existing image is
reused.
---
 ci-automation/vendor-testing/azure.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh
index c7bf801a57..745f0bb88c 100755
--- a/ci-automation/vendor-testing/azure.sh
+++ b/ci-automation/vendor-testing/azure.sh
@@ -25,7 +25,7 @@ secret_to_file azure_auth_config_file "${AZURE_AUTH_CREDENTIALS}"
 
 # Fetch the Azure image if not present
 if [ -f "${AZURE_IMAGE_NAME}" ] ; then
-    echo "++++ ${CIA_TESTSCRIPT}: Using existing ${work_dir}/${AZURE_IMAGE_NAME} for testing ${CIA_VERNUM} (${CIA_ARCH}) ++++"
+    echo "++++ ${CIA_TESTSCRIPT}: Using existing ${AZURE_IMAGE_NAME} for testing ${CIA_VERNUM} (${CIA_ARCH}) ++++"
 else
     echo "++++ ${CIA_TESTSCRIPT}: downloading ${AZURE_IMAGE_NAME} for ${CIA_VERNUM} (${CIA_ARCH}) ++++"
     copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${AZURE_IMAGE_NAME}.bz2" .

From 23a05949c1e2816fc8532803f0a981d4c5812af9 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 3 Aug 2022 16:22:38 +0200
Subject: [PATCH 3/4] 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/}
 

From 661a4067a16ba087827989d7e8e8e60b936e4494 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 3 Aug 2022 16:23:15 +0200
Subject: [PATCH 4/4] ci-automation/vendor-testing/azure.sh: Use an array for
 extra instance types

---
 ci-automation/vendor-testing/azure.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh
index 0fe91b1073..17081b3598 100755
--- a/ci-automation/vendor-testing/azure.sh
+++ b/ci-automation/vendor-testing/azure.sh
@@ -17,7 +17,6 @@ basename="ci-${CIA_VERNUM//+/-}-${CIA_ARCH}"
 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/}
 
 azure_profile_config_file=''
 secret_to_file azure_profile_config_file "${AZURE_PROFILE}"
@@ -75,11 +74,16 @@ query_kola_tests() {
     kola list --platform=azure --filter "${@}"
 }
 
+other_instance_types=()
+if [[ "${CIA_ARCH}" = 'amd64' ]]; then
+    other_instance_types+=('V1')
+fi
+
 run_kola_tests_on_instances \
     "${azure_instance_type}" \
     "${CIA_TAPFILE}" \
     "${CIA_FIRST_RUN}" \
-    ${IS_AMD64:+V1} \
+    "${other_instance_types[@]}" \
     '--' \
     'cl.internet' \
     '--' \