Skip to content

Commit 791ab91

Browse files
committed
github/workflows: Run full CI for aarch64
- Install podman on aarch64 runners - Only check for EFI on aarch64 - Update shim path for aarch64
1 parent 0555525 commit 791ab91

File tree

2 files changed

+37
-6
lines changed

2 files changed

+37
-6
lines changed

.github/workflows/ci.yml

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,43 @@ env:
1919

2020
jobs:
2121
c9s-bootc-e2e:
22-
runs-on: ubuntu-24.04
22+
strategy:
23+
matrix:
24+
runner:
25+
- ubuntu-24.04
26+
- ubuntu-24.04-arm
27+
28+
runs-on: [ "${{ matrix.runner }}" ]
29+
2330
steps:
2431
- uses: actions/checkout@v4
32+
33+
- name: Install podman
34+
if: ( matrix.runner == 'ubuntu-24.04-arm' )
35+
run: |
36+
sudo apt update -y
37+
sudo apt install -y podman
38+
2539
- name: build
2640
run: sudo podman build -t localhost/bootupd:latest -f ci/Containerfile.c9s .
41+
2742
- name: bootupctl status in container
2843
run: |
2944
set -xeuo pipefail
45+
arch="$(uname --machine)"
46+
if [[ "${arch}" == "x86_64" ]]; then
47+
components_text='Available components: BIOS EFI'
48+
components_json='{"components":["BIOS","EFI"]}'
49+
else
50+
# Assume aarch64 for now
51+
components_text='Available components: EFI'
52+
components_json='{"components":["EFI"]}'
53+
fi
3054
output=$(sudo podman run --rm -ti localhost/bootupd:latest bootupctl status | tr -d '\r')
31-
[ "Available components: BIOS EFI" == "${output}" ]
55+
[ "${components_text}" == "${output}" ]
3256
output=$(sudo podman run --rm -ti localhost/bootupd:latest bootupctl status --json)
33-
[ '{"components":["BIOS","EFI"]}' == "${output}" ]
57+
[ "${components_json}" == "${output}" ]
58+
3459
- name: bootc install to disk
3560
run: |
3661
set -xeuo pipefail
@@ -44,10 +69,18 @@ jobs:
4469
sudo losetup -P -f myimage.raw
4570
device=$(losetup --list --noheadings --output NAME,BACK-FILE | grep myimage.raw | awk '{print $1}')
4671
sudo mount "${device}p2" /mnt/
47-
sudo ls /mnt/EFI/centos/{grub.cfg,shimx64.efi}
72+
arch="$(uname --machine)"
73+
if [[ "${arch}" == "x86_64" ]]; then
74+
shim="shimx64.efi"
75+
else
76+
# Assume aarch64 for now
77+
shim="shimaa64.efi"
78+
fi
79+
sudo ls /mnt/EFI/centos/{grub.cfg,${shim}}
4880
sudo umount /mnt
4981
sudo losetup -D "${device}"
5082
sudo rm -f myimage.raw
83+
5184
- name: bootc install to filesystem
5285
run: |
5386
set -xeuo pipefail

.github/workflows/cross.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ jobs:
1313
strategy:
1414
matrix:
1515
include:
16-
- arch: aarch64
17-
distro: ubuntu_latest
1816
- arch: s390x
1917
distro: ubuntu_latest
2018
- arch: ppc64le

0 commit comments

Comments
 (0)