mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 11:51:14 +02:00
Switch to uploading a gallery image once
Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
parent
328887618d
commit
56140da5eb
@ -24,10 +24,20 @@ if [ -f "${AZURE_IMAGE_NAME}" ] ; then
|
||||
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" .
|
||||
copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/version.txt" .
|
||||
cp --sparse=always <(lbzcat "${AZURE_IMAGE_NAME}.bz2") "${AZURE_IMAGE_NAME}"
|
||||
rm "${AZURE_IMAGE_NAME}.bz2"
|
||||
fi
|
||||
|
||||
# ore gc will clean this up within 5h
|
||||
imgid=$(ore azure create-gallery-image --azure-identity \
|
||||
--azure-location "${AZURE_LOCATION}" \
|
||||
--file "${AZURE_IMAGE_NAME}" \
|
||||
--hyper-v-generation V2 \
|
||||
--board="${board}" | sed 's/{/\n{/' | tail -n1 | jq -r .ID)
|
||||
rm -f "${AZURE_IMAGE_NAME}"
|
||||
echo "Using gallery image: $imgid"
|
||||
|
||||
run_kola_tests() {
|
||||
local instance_type="${1}"; shift
|
||||
local instance_tapfile="${1}"; shift
|
||||
@ -45,12 +55,11 @@ run_kola_tests() {
|
||||
--parallel="${AZURE_PARALLEL}" \
|
||||
--offering=basic \
|
||||
--platform=azure \
|
||||
--azure-image-file="${AZURE_IMAGE_NAME}" \
|
||||
--azure-disk-uri="${imgid}" \
|
||||
--azure-location="${AZURE_LOCATION}" \
|
||||
--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}} \
|
||||
${AZURE_RESOURCE_GROUP:+--azure-resource-group=${AZURE_RESOURCE_GROUP}} \
|
||||
|
||||
@ -1 +1 @@
|
||||
ghcr.io/flatcar/mantle:git-3321b584ff11c5cab13bde61398c30b4d205b999
|
||||
ghcr.io/flatcar/mantle:pr-523
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user