From 7e430cbce98d46a036d42d2c1dd289b48036b3a2 Mon Sep 17 00:00:00 2001 From: Sayan Chowdhury Date: Wed, 25 May 2022 15:26:58 +0530 Subject: [PATCH] fixup! ci-automation/azure: Add initial container tests infra for Azure --- ci-automation/vendor-testing/azure.sh | 37 ++++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh index ca6fc19ded..72c2da40fe 100755 --- a/ci-automation/vendor-testing/azure.sh +++ b/ci-automation/vendor-testing/azure.sh @@ -44,6 +44,7 @@ fi set -o noglob run_kola_tests() { + local instance_type="${1}"; shift local instance_tapfile="${1}"; shift local hyperv_gen="v2" if [ "${instance_type}" = "v1" ]; then @@ -52,24 +53,24 @@ run_kola_tests() { fi timeout --signal=SIGQUIT 20h \ - kola run \ - --board="${board}" \ - --basename="${basename}" \ - --parallel="${AZURE_PARALLEL}" \ - --offering=basic \ - --platform=azure \ - --azure-image-file="${AZURE_IMAGE_NAME}" \ - --azure-location="${AZURE_LOCATION}" \ - --azure-profile="${azure_profile_config_file}" \ - --azure-auth="${azure_auth_config_file}" \ - --torcx-manifest=${CIA_TORCX_MANIFEST} \ - --tapfile="${instance_tapfile}" \ - --azure-size=${instance_type} \ - --azure-hyper-v-generation=${hyperv_gen} \ - ${AZURE_USE_GALLERY} \ - ${azure_vnet_subnet_name:+--azure-vnet-subnet-name=${azure_vnet_subnet_name}} \ - ${AZURE_USE_PRIVATE_IPS:+--azure-use-private-ips=${AZURE_USE_PRIVATE_IPS}} \ - "${@}" + kola run \ + --board="${board}" \ + --basename="${basename}" \ + --parallel="${AZURE_PARALLEL}" \ + --offering=basic \ + --platform=azure \ + --azure-image-file="${AZURE_IMAGE_NAME}" \ + --azure-location="${AZURE_LOCATION}" \ + --azure-profile="${azure_profile_config_file}" \ + --azure-auth="${azure_auth_config_file}" \ + --torcx-manifest=${CIA_TORCX_MANIFEST} \ + --tapfile="${instance_tapfile}" \ + --azure-size=${instance_type} \ + --azure-hyper-v-generation=${hyperv_gen} \ + ${AZURE_USE_GALLERY} \ + ${azure_vnet_subnet_name:+--azure-vnet-subnet-name=${azure_vnet_subnet_name}} \ + ${AZURE_USE_PRIVATE_IPS:+--azure-use-private-ips=${AZURE_USE_PRIVATE_IPS}} \ + "${@}" } query_kola_tests() {