From 7dc45a4a1fbef53e6a4f6f55e511a93267c449c7 Mon Sep 17 00:00:00 2001
From: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
Date: Tue, 12 Jul 2022 19:46:27 +0300
Subject: [PATCH] Make QEMU_UEFI_BIOS configurable

Signed-off-by: Gabriel Adrian Samfira <gsamfira@cloudbasesolutions.com>
---
 ci-automation/ci-config.env          | 2 +-
 ci-automation/test.sh                | 2 +-
 ci-automation/vendor-testing/qemu.sh | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ci-automation/ci-config.env b/ci-automation/ci-config.env
index 2b3289283b..e418c06d2e 100644
--- a/ci-automation/ci-config.env
+++ b/ci-automation/ci-config.env
@@ -53,7 +53,7 @@ QEMU_BIOS="/usr/share/qemu/bios-256k.bin"
 
 # UEFI bios filename on build cache.
 # 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 --
diff --git a/ci-automation/test.sh b/ci-automation/test.sh
index 9162aecfaf..947f3dee8a 100644
--- a/ci-automation/test.sh
+++ b/ci-automation/test.sh
@@ -217,7 +217,7 @@ function _test_run_impl() {
         echo "########### All re-runs exhausted ($retries). Giving up. ###########"
     fi
 
-    if [ ${skip_copy_to_bincache} -eq 0 ]
+    if [ ${skip_copy_to_bincache} -eq 0 ];then
         # publish kola output, TAP files to build cache
         copy_to_buildcache "testing/${vernum}/${arch}/${image}" \
             "${tests_dir}/_kola_temp"
diff --git a/ci-automation/vendor-testing/qemu.sh b/ci-automation/vendor-testing/qemu.sh
index 9b2e8dd750..a13e6d0495 100755
--- a/ci-automation/vendor-testing/qemu.sh
+++ b/ci-automation/vendor-testing/qemu.sh
@@ -32,7 +32,7 @@ bios="${QEMU_BIOS}"
 if [ "${CIA_TESTSCRIPT}" = "qemu_uefi.sh" ] ; then
     bios="${QEMU_UEFI_BIOS}"
     if [ -f "${bios}" ] ; then
-        echo "++++ ${CIA_TESTSCRIPT}: Using existing ./${bios} ++++"
+        echo "++++ ${CIA_TESTSCRIPT}: Using existing ${bios} ++++"
     else
         echo "++++ ${CIA_TESTSCRIPT}: downloading ${bios} for ${CIA_VERNUM} (${CIA_ARCH}) ++++"
         copy_from_buildcache "images/${CIA_ARCH}/${CIA_VERNUM}/${bios}" .