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

Make QEMU_UEFI_BIOS configurable

Browse Source 
Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
This commit is contained in:
Gabriel Adrian Samfira 2022-07-12 19:46:27 +03:00
parent 6eabd91a04
commit 7dc45a4a1f
No known key found for this signature in database
GPG Key ID: 7D073DCC2C074CB5
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,7 +53,7 @@ QEMU_BIOS="/usr/share/qemu/bios-256k.bin"
# UEFI bios filename on build cache. # UEFI bios filename on build cache.
# Published by vms.sh as part of the qemu vendor build. # Published by vms.sh as part of the qemu vendor build.
QEMU_UEFI_BIOS="flatcar_production_qemu_uefi_efi_code.fd" QEMU_UEFI_BIOS="${QEMU_UEFI_BIOS:-flatcar_production_qemu_uefi_efi_code.fd}"
# -- Equinix Metal -- # -- Equinix Metal --

2
ci-automation/test.sh
View File

@ -217,7 +217,7 @@ function _test_run_impl() {
echo "########### All re-runs exhausted ($retries). Giving up. ###########" echo "########### All re-runs exhausted ($retries). Giving up. ###########"
fi fi
if [ ${skip_copy_to_bincache} -eq 0 ] if [ ${skip_copy_to_bincache} -eq 0 ];then
# publish kola output, TAP files to build cache # publish kola output, TAP files to build cache
copy_to_buildcache "testing/${vernum}/${arch}/${image}" \ copy_to_buildcache "testing/${vernum}/${arch}/${image}" \
"${tests_dir}/_kola_temp" "${tests_dir}/_kola_temp"

2
ci-automation/vendor-testing/qemu.sh
View File

@ -32,7 +32,7 @@ bios="${QEMU_BIOS}"
if [ "${CIA_TESTSCRIPT}" = "qemu_uefi.sh" ] ; then if [ "${CIA_TESTSCRIPT}" = "qemu_uefi.sh" ] ; then
bios="${QEMU_UEFI_BIOS}" bios="${QEMU_UEFI_BIOS}"
if [ -f "${bios}" ] ; then if [ -f "${bios}" ] ; then
echo "++++ ${CIA_TESTSCRIPT}: Using existing ./${bios} ++++" echo "++++ ${CIA_TESTSCRIPT}: Using existing ${bios} ++++"
else else
echo "++++ ${CIA_TESTSCRIPT}: downloading ${bios} for ${CIA_VERNUM} (${CIA_ARCH}) ++++" echo "++++ ${CIA_TESTSCRIPT}: downloading ${bios} for ${CIA_VERNUM} (${CIA_ARCH}) ++++"
copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${bios}" . copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${bios}" .