Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fedora updates #29

Merged
merged 7 commits into from
Mar 27, 2024
Merged

Fedora updates #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1045a9d
autohck: Check that OVMF binary exists
kostyanf14 Feb 15, 2024
4d474b5
tests: Install procps on Fedora
kostyanf14 Feb 15, 2024
e83cd47
Add Fedora 39 OVMF support
kostyanf14 Feb 15, 2024
44b230c
Add Fedora 39 into tests
kostyanf14 Feb 15, 2024
ed114b6
Add downscript to QEMU command line
kostyanf14 Feb 15, 2024
90a3e2c
CI: Do not run QEMU master on old OSes
kostyanf14 Feb 15, 2024
a87f4d9
Merge RHEL/CentOS OVMF with Fedora
kostyanf14 Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/test-install.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
images: ['fedora:34', 'fedora:37', 'ubuntu:20', 'ubuntu:22', 'centos:9']
images: ['fedora:34', 'fedora:37', 'fedora:39', 'ubuntu:20', 'ubuntu:22', 'centos:9']
fail-fast: false

steps:
Expand All @@ -22,7 +22,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
images: ['fedora:34', 'fedora:37', 'ubuntu:20', 'ubuntu:22', 'centos:9']
akihikodaki marked this conversation as resolved.
Show resolved Hide resolved
images: ['fedora:39', 'ubuntu:22', 'centos:9']
fail-fast: false

steps:
Expand Down
38 changes: 23 additions & 15 deletions autohck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,31 +116,39 @@ get_fw_config() {

case "$lsb_dist" in
ubuntu)
echo "OVMF_CODE='/usr/share/OVMF/OVMF_CODE_4M.fd'"
echo "OVMF_VARS='/usr/share/OVMF/OVMF_VARS_4M.fd'"
OVMF_CODE='/usr/share/OVMF/OVMF_CODE_4M.fd'

echo "OVMF_CODE_SB='/usr/share/OVMF/OVMF_CODE_4M.ms.fd'"
echo "OVMF_VARS_SB='/usr/share/OVMF/OVMF_VARS_4M.ms.fd'"
OVMF_CODE_SB='/usr/share/OVMF/OVMF_CODE_4M.ms.fd'
OVMF_VARS_SB='/usr/share/OVMF/OVMF_VARS_4M.ms.fd'
;;
centos|rhel)
echo "OVMF_CODE='/usr/share/edk2/ovmf/OVMF_CODE.fd'"
echo "OVMF_VARS='/usr/share/edk2/ovmf/OVMF_VARS.fd'"
centos|rhel|fedora)
OVMF_CODE='/usr/share/edk2/ovmf-4m/OVMF_CODE.fd'
if [ ! -f "${OVMF_CODE}" ]; then OVMF_CODE='/usr/share/edk2/ovmf/OVMF_CODE_4M.secboot.qcow2'; fi

echo "OVMF_CODE_SB='/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd'"
echo "OVMF_VARS_SB='/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd'"
;;
fedora)
echo "OVMF_CODE='/usr/share/edk2/ovmf-4m/OVMF_CODE.fd'"
echo "OVMF_VARS='/usr/share/edk2/ovmf-4m/OVMF_VARS.fd'"
OVMF_CODE_SB='/usr/share/edk2/ovmf-4m/OVMF_CODE.secboot.fd'
if [ ! -f "${OVMF_CODE_SB}" ]; then OVMF_CODE_SB='/usr/share/edk2/ovmf/OVMF_CODE_4M.qcow2'; fi

OVMF_VARS_SB='/usr/share/edk2/ovmf-4m/OVMF_VARS.secboot.fd'
if [ ! -f "${OVMF_VARS_SB}" ]; then OVMF_VARS_SB='/usr/share/edk2/ovmf/OVMF_VARS_4M.secboot.qcow2'; fi

echo "OVMF_CODE_SB='/usr/share/edk2/ovmf-4m/OVMF_CODE.secboot.fd'"
echo "OVMF_VARS_SB='/usr/share/edk2/ovmf-4m/OVMF_VARS.secboot.fd'"
# RHEL/CentOS and Fedora 34 have different paths
if [ ! -f "${OVMF_CODE}" ]; then OVMF_CODE='/usr/share/edk2/ovmf/OVMF_CODE.fd'; fi
if [ ! -f "${OVMF_CODE_SB}" ]; then OVMF_CODE_SB='/usr/share/edk2/ovmf/OVMF_CODE.secboot.fd'; fi
if [ ! -f "${OVMF_VARS_SB}" ]; then OVMF_VARS_SB='/usr/share/edk2/ovmf/OVMF_VARS.secboot.fd'; fi
;;

*)
log_fatal "Distributive '$lsb_dist' is unsupported. Please compile QEMU manually."
;;
esac

[ -f "${OVMF_CODE}" ] || log_fatal "OVMF_CODE file '$OVMF_CODE' does not exist. Please configure OVMF manually."
[ -f "${OVMF_CODE_SB}" ] || log_fatal "OVMF_CODE_SB file '$OVMF_CODE_SB' does not exist. Please configure OVMF manually."
[ -f "${OVMF_VARS_SB}" ] || log_fatal "OVMF_VARS file '$OVMF_VARS_SB' does not exist. Please configure OVMF manually."

echo "OVMF_CODE='${OVMF_CODE}'"
echo "OVMF_CODE_SB='${OVMF_CODE_SB}'"
echo "OVMF_VARS_SB='${OVMF_VARS_SB}'"
}

post_clone_AUTOHCK() {
Expand Down
1 change: 0 additions & 1 deletion config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jq -n \
--arg playlists_path "${HLK_PLAYLISTS_DIR}" \
--arg filters_path "${HCK_FILTERS_DIR}/UpdateFilters.sql" \
--arg ovmf_code "${OVMF_CODE}" \
--arg ovmf_vars "${OVMF_VARS}" \
--arg ovmf_code_sb "${OVMF_CODE_SB}" \
--arg ovmf_vars_sb "${OVMF_VARS_SB}" \
--arg qemu_bin "${QEMU_BIN}" \
Expand Down
2 changes: 1 addition & 1 deletion qemu.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ check_qemu() {
if [ "${DISABLE_KVM_CHECK}" != "yes" ]; then
qemu_args+=(
-enable-kvm
-netdev tap,id=net0,vhost=on,script=no -device e1000,netdev=net0
-netdev tap,id=net0,vhost=on,script=no,downscript=no -device e1000,netdev=net0
)
fi

Expand Down
2 changes: 1 addition & 1 deletion tests/create_run_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ case "${test_dist}" in
;;
*)
echo dnf makecache
echo dnf install -y git jq which >> "${test_script}"
echo dnf install -y git jq which procps >> "${test_script}"
;;
esac
;;
Expand Down
1 change: 1 addition & 0 deletions tests/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ declare -A test_image_list test_dist_list
test_image_list[centos:9]=quay.io/centos/centos:stream9
test_image_list[fedora:34]=fedora:34
test_image_list[fedora:37]=fedora:37
test_image_list[fedora:39]=fedora:39
test_image_list[ubuntu:20]=ubuntu:20.04
test_image_list[ubuntu:22]=ubuntu:22.04

Expand Down
Loading