Skip to content

Fix CI #1162

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

Merged
Rolv-Apneseth merged 2 commits into from
Sep 21, 2026
+6 −35
Merged

Fix CI #1162

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a3533b
ci: skip running bootc-e2e on forks
Rolv-Apneseth Sep 21, 2026
6837359
ci: use bootc-dev/actions/bootc-ubuntu-setup
Rolv-Apneseth Sep 21, 2026
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
41 changes: 6 additions & 35 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ env:

jobs:
bootc-e2e:
if: github.repository == 'coreos/bootupd'
strategy:
matrix:
runner:
Expand All @@ -39,22 +40,13 @@ jobs:
runs-on: [ "${{ matrix.runner }}" ]

steps:
- name: Install QEMU and OVMF for VM boot tests
if: ${{ matrix.runner == 'ubuntu-24.04' }}
shell: bash
run: |
set -xeuo pipefail
sudo apt install -y qemu-utils qemu-kvm ovmf
- uses: bootc-dev/actions/bootc-ubuntu-setup@fdfe1dc66edbfa03897ab619a5c037fb8f5339ff
with:
libvirt: ${{ matrix.runner == 'ubuntu-24.04' && 'true' || 'false' }}

- name: Enable unprivileged /dev/kvm access
- name: Install OVMF for UEFI VM boot tests
if: ${{ matrix.runner == 'ubuntu-24.04' }}
shell: bash
run: |
set -xeuo pipefail
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
sudo udevadm control --reload-rules
sudo udevadm trigger --name-match=kvm
ls -l /dev/kvm
run: sudo apt-get install -y ovmf

@cgwalters cgwalters Sep 21, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am pretty sure we do this in bootc-ubuntu-setup

@Rolv-Apneseth Rolv-Apneseth Sep 21, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be missing something but I'm only seeing https://github.com/bootc-dev/actions/blob/main/bootc-ubuntu-setup/action.yml#L128 which is for ubuntu-26.04

@cgwalters cgwalters Sep 22, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yeah, that's a bug I guess. But OTOH, there's no reason now not to just jump to 26.04


- name: Setup env
run: |
Expand All @@ -70,29 +62,8 @@ jobs:
echo "IMG_NAME=${IMG_NAME}" >> "$GITHUB_ENV"
echo "OS_ID=${OS_ID}" >> "$GITHUB_ENV"

- name: Get a newer podman for heredoc support (from debian testing)
run: |
set -eux
echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6ED0E7B82643E131 78DBA3BC47EF2265
sudo apt update
DIVERSION_PATHS="lib32 libo32 lib64"
for PATH_NAME in $DIVERSION_PATHS; do
sudo dpkg-divert --remove --package base-files --divert /$PATH_NAME.usr-is-merged /$PATH_NAME || true
sudo dpkg-divert --remove --package base-files --divert /.$PATH_NAME.usr-is-merged /$PATH_NAME || true
done
sudo dpkg --configure -a
sudo apt --fix-broken install
sudo apt install -y crun/testing podman/testing skopeo/testing

- uses: actions/checkout@v7

- name: Install podman
if: ( matrix.runner == 'ubuntu-24.04-arm' )
run: |
sudo apt update -y
sudo apt install -y podman

- name: build with grubcc=${{ matrix.grubcc }}
run: |
if [[ "${{ matrix.grubcc }}" == "1" ]]; then
Expand Down
Loading