Merge pull request #2092 from flatcar/jepio/azure-ci-update

ci-automation/vendor-testing/azure: Allow passing kola vnet
flatcar · Jul 8, 2024 · a67869f · a67869f
2 parents d65a28e + a35bd4c
commit a67869f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env
@@ -149,6 +149,7 @@ AWS_PARALLEL="${PARALLEL_TESTS:-8}"
 : ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v4"}
 : ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v5"}
 : ${AZURE_USE_GALLERY:=""}
+: ${AZURE_KOLA_VNET:=""}
 : ${AZURE_USE_PRIVATE_IPS:=true}
 : ${AZURE_VNET_SUBNET_NAME:="jenkins-vnet-westeurope"}
 AZURE_PARALLEL="${PARALLEL_TESTS:-20}"

diff --git a/ci-automation/vendor-testing/azure.sh b/ci-automation/vendor-testing/azure.sh
@@ -56,6 +56,7 @@ run_kola_tests() {
       --azure-size="${instance_type}" \
       --azure-hyper-v-generation="${hyperv_gen}" \
       ${AZURE_USE_GALLERY} \
+      ${AZURE_KOLA_VNET:+--azure-kola-vnet=${AZURE_KOLA_VNET}} \
       ${azure_vnet_subnet_name:+--azure-vnet-subnet-name=${azure_vnet_subnet_name}} \
       ${AZURE_USE_PRIVATE_IPS:+--azure-use-private-ips=${AZURE_USE_PRIVATE_IPS}} \
       "${@}"