Skip to content

Commit e97d88a

Browse files
committed
[ci] Update to ubuntu-24.04 workflow runners
Signed-off-by: Michael Brown <mbrown@fensystems.co.uk>
1 parent fdbe965 commit e97d88a

6 files changed

Lines changed: 21 additions & 11 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66

77
gcc:
88
name: Build (gcc)
9-
runs-on: ubuntu-20.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Check out code
1212
uses: actions/checkout@v4
@@ -22,7 +22,7 @@ jobs:
2222
2323
clang:
2424
name: Build (clang)
25-
runs-on: ubuntu-20.04
25+
runs-on: ubuntu-24.04
2626
steps:
2727
- name: Check out code
2828
uses: actions/checkout@v4

.github/workflows/coverity.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
submit:
1010
name: Submit
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Check out code
1414
uses: actions/checkout@v4

.github/workflows/prerelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
release:
1515
name: Create release
16-
runs-on: ubuntu-20.04
16+
runs-on: ubuntu-24.04
1717
steps:
1818

1919
- name: Check out code

.github/workflows/qa.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
secrets:
1111
name: Secrets check
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
env:
1414
IMAGES_RSYNC_URI: ${{ secrets.IMAGES_RSYNC_URI }}
1515
outputs:
@@ -24,7 +24,7 @@ jobs:
2424
2525
cache:
2626
name: Image cache
27-
runs-on: ubuntu-20.04
27+
runs-on: ubuntu-24.04
2828
needs: secrets
2929
if: needs.secrets.outputs.present
3030
outputs:
@@ -73,7 +73,7 @@ jobs:
7373
7474
test:
7575
name: Test
76-
runs-on: ubuntu-20.04
76+
runs-on: ubuntu-24.04
7777
needs: cache
7878
if: ${{ github.event_name == 'push' }}
7979
steps:
@@ -86,7 +86,7 @@ jobs:
8686
sudo apt update
8787
sudo apt install -y -o Acquire::Retries=50 \
8888
pesign gcab gcc-aarch64-linux-gnu \
89-
qemu-system-x86 ovmf \
89+
qemu-system-x86 ovmf libvirt-daemon \
9090
python3-libvirt python3-lxml python3-pil \
9191
python3-qrcode python3-yaml python3-zbar
9292

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99

1010
release:
1111
name: Update release
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
steps:
1414

1515
- name: Check out code

test/testwimboot

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ import zbar
2424
QEMU_NS = 'http://libvirt.org/schemas/domain/qemu/1.0'
2525
etree.register_namespace('qemu', QEMU_NS)
2626

27-
OVMF_PATH = '/usr/share/OVMF/OVMF_CODE.fd'
27+
OVMF_PATHS = [
28+
'/usr/share/OVMF/OVMF_CODE.fd',
29+
'/usr/share/OVMF/OVMF_CODE_2M.fd',
30+
'/usr/share/OVMF/OVMF_CODE_4M.fd'
31+
]
2832

2933

3034
class Verbosity(IntEnum):
@@ -80,6 +84,11 @@ def ipxe_script(uuid, version, arch, bootmgr, bcd, bootsdi, bootargs):
8084
return script
8185

8286

87+
def ovmf_path():
88+
"""Determine OVMF path"""
89+
return next(x for x in OVMF_PATHS if os.path.exists(x))
90+
91+
8392
def vm_xml(virttype, name, uuid, memory, uefi, dbgfile, serfile, romfile,
8493
booturl):
8594
"""Construct XML description of VM"""
@@ -95,7 +104,8 @@ def vm_xml(virttype, name, uuid, memory, uefi, dbgfile, serfile, romfile,
95104
x_ostype.attrib['arch'] = 'x86_64'
96105
if uefi:
97106
x_loader = etree.SubElement(x_os, 'loader')
98-
x_loader.text = OVMF_PATH
107+
x_loader.text = ovmf_path()
108+
x_loader.attrib['type'] = 'pflash'
99109
x_features = etree.SubElement(x_domain, 'features')
100110
x_acpi = etree.SubElement(x_features, 'acpi')
101111
x_boot = etree.SubElement(x_os, 'boot')

0 commit comments

Comments
 (0)