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

Merge pull request #397 from flatcar-linux/krnowak/azure-fixes

Browse Source 
Fixes for azure vendor test
This commit is contained in:
Krzesimir Nowak 2022-08-03 18:07:08 +02:00 committed by GitHub
commit a39c80023e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,8 +122,8 @@ AWS_PARALLEL="${PARALLEL_TESTS:-8}"
# -- Azure -- # -- Azure --
: ${AZURE_IMAGE_NAME:="flatcar_production_azure_image.vhd"} : ${AZURE_IMAGE_NAME:="flatcar_production_azure_image.vhd"}
: ${AZURE_MACHINE_SIZE:="Standard_D2s_v4"} : ${AZURE_amd64_MACHINE_SIZE:="Standard_D2s_v4"}
: ${AZURE_MORE_MACHINE_SIZE:="Standard_D2s_v4"} : ${AZURE_arm64_MACHINE_SIZE:="Standard_D2pls_v5"}
: ${AZURE_USE_GALLERY:=""} : ${AZURE_USE_GALLERY:=""}
: ${AZURE_USE_PRIVATE_IPS:=true} : ${AZURE_USE_PRIVATE_IPS:=true}
: ${AZURE_VNET_SUBNET_NAME:="jenkins-vnet-westeurope"} : ${AZURE_VNET_SUBNET_NAME:="jenkins-vnet-westeurope"}

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

@ -14,9 +14,9 @@ source ci-automation/vendor_test.sh
board="${CIA_ARCH}-usr" board="${CIA_ARCH}-usr"
basename="ci-${CIA_VERNUM//+/-}-${CIA_ARCH}" 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}" azure_vnet_subnet_name="jenkins-vnet-${AZURE_LOCATION}"
IS_AMD64=${CIA_ARCH//arm64/}
azure_profile_config_file='' azure_profile_config_file=''
secret_to_file azure_profile_config_file "${AZURE_PROFILE}" secret_to_file azure_profile_config_file "${AZURE_PROFILE}"
@ -25,7 +25,7 @@ secret_to_file azure_auth_config_file "${AZURE_AUTH_CREDENTIALS}"
# Fetch the Azure image if not present # Fetch the Azure image if not present
if [ -f "${AZURE_IMAGE_NAME}" ] ; then 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 else
echo "++++ ${CIA_TESTSCRIPT}: downloading ${AZURE_IMAGE_NAME} for ${CIA_VERNUM} (${CIA_ARCH}) ++++" echo "++++ ${CIA_TESTSCRIPT}: downloading ${AZURE_IMAGE_NAME} for ${CIA_VERNUM} (${CIA_ARCH}) ++++"
copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${AZURE_IMAGE_NAME}.bz2" . copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${AZURE_IMAGE_NAME}.bz2" .
@ -41,9 +41,9 @@ fi
run_kola_tests() { run_kola_tests() {
local instance_type="${1}"; shift local instance_type="${1}"; shift
local instance_tapfile="${1}"; shift local instance_tapfile="${1}"; shift
local hyperv_gen="v2" local hyperv_gen="V2"
if [ "${instance_type}" = "v1" ]; then if [ "${instance_type}" = "V1" ]; then
hyperv_gen="v1" hyperv_gen="V1"
instance_type="${azure_instance_type}" instance_type="${azure_instance_type}"
fi fi
@ -74,11 +74,16 @@ query_kola_tests() {
kola list --platform=azure --filter "${@}" kola list --platform=azure --filter "${@}"
} }
other_instance_types=()
if [[ "${CIA_ARCH}" = 'amd64' ]]; then
other_instance_types+=('V1')
fi
run_kola_tests_on_instances \ run_kola_tests_on_instances \
"${azure_instance_type}" \ "${azure_instance_type}" \
"${CIA_TAPFILE}" \ "${CIA_TAPFILE}" \
"${CIA_FIRST_RUN}" \ "${CIA_FIRST_RUN}" \
${IS_AMD64:+v1} \ "${other_instance_types[@]}" \
'--' \ '--' \
'cl.internet' \ 'cl.internet' \
'--' \ '--' \