mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 07:01:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
ci-automation/vendor-testing/azure: Allow passing kola vnet
This commit is contained in:
Jeremi Piotrowski 2024-07-08 10:12:56 +02:00 committed by GitHub
commit a67869fda3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci-automation/ci-config.env
View File

@ -149,6 +149,7 @@ AWS_PARALLEL="${PARALLEL_TESTS:-8}"
: ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v4"} : ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v4"}
: ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v5"} : ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v5"}
: ${AZURE_USE_GALLERY:=""} : ${AZURE_USE_GALLERY:=""}
: ${AZURE_KOLA_VNET:=""}
: ${AZURE_USE_PRIVATE_IPS:=true} : ${AZURE_USE_PRIVATE_IPS:=true}
: ${AZURE_VNET_SUBNET_NAME:="jenkins-vnet-westeurope"} : ${AZURE_VNET_SUBNET_NAME:="jenkins-vnet-westeurope"}
AZURE_PARALLEL="${PARALLEL_TESTS:-20}" AZURE_PARALLEL="${PARALLEL_TESTS:-20}"

1
ci-automation/vendor-testing/azure.sh
View File

@ -56,6 +56,7 @@ run_kola_tests() {
--azure-size="${instance_type}" \ --azure-size="${instance_type}" \
--azure-hyper-v-generation="${hyperv_gen}" \ --azure-hyper-v-generation="${hyperv_gen}" \
${AZURE_USE_GALLERY} \ ${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_vnet_subnet_name:+--azure-vnet-subnet-name=${azure_vnet_subnet_name}} \
${AZURE_USE_PRIVATE_IPS:+--azure-use-private-ips=${AZURE_USE_PRIVATE_IPS}} \ ${AZURE_USE_PRIVATE_IPS:+--azure-use-private-ips=${AZURE_USE_PRIVATE_IPS}} \
"${@}" "${@}"