Skip to content

ci: Cover btrfs on Fedora 44 - #2644

Merged
jmarrero merged 4 commits into
bootc-dev:mainfrom
jmarrero-forge:bot/btrfs-ci-fedora
Nov 10, 2026
Merged

jmarrero merged 4 commits into
bootc-dev:mainfrom
jmarrero-forge:bot/btrfs-ci-fedora

Conversation

@jmarrero-bot

Copy link
Copy Markdown
Contributor

No CI job installed onto btrfs, Fedora's default root filesystem, which supports fs-verity (so composefs gets a strict command line there). This adds it on Fedora 44:

  • test-integration: composefs btrfs systemd UKI sealed (readonly image-upgrade-reboot, as the other sealed cells), composefs btrfs grub BLS and ostree btrfs grub BLS (both the full integration set). It uses the existing filesystem axis plus excludes rather than include:, so ci/tier-1 runs (centos-10 only) get no fedora-44 row.
  • test-upgrade (fedora-44, composefs) is back, now on btrfs. It was excluded until 1.16.8 for the deadlock fixed in 71ad2d3; the published fedora-bootc:44 ships 1.17.1.
  • xtask: install_args only passed --filesystem to bcvk for composefs, so the ostree cell would have silently installed on xfs.

Per-PR cost, from the matching cells of run 42243165273: sealed UKI ~35-40 min, composefs BLS ~2.5 h, ostree ~3 h, upgrade ~15 min, about 6.5 runner-hours on top of ~42 for test-integration today. Wall-clock time doesn't change (the longest existing cell takes 3.5 h). If that is too much, the composefs BLS cell could run a reduced set (readonly image-upgrade-reboot composefs-verity composefs-gc rollback, ~45 min), which needs a small test-composefs knob since its plan filter always includes integration; the ostree cell is its own commit and can be dropped.

Matrix expansion (checked with a script that reproduces the 19 cells of that run from main's workflow): the full OS list goes from 19 to 22 integration and from 3 to 4 upgrade jobs; ci/tier-1 stays at 7 and 2, all centos-10. actionlint reports nothing new.

Testing, on a 16-core devspace (jmarrero-devspace-42377888679) at a266a79 (7436abd since then only rewords a Justfile comment), running each cell with CI's env and steps (BOOTC_filesystem=btrfs etc., prebuilt packages, build-fetch, build, test-container-integration, then test-composefs / test-tmt integration / test-upgrade):

  • composefs btrfs systemd UKI sealed: passed (readonly, image-upgrade-reboot)
  • test-upgrade fedora-44 composefs btrfs: passed (installed by bootc 1.17.1, upgraded, readonly)
  • composefs btrfs grub BLS, full integration: all 30 plans passed (~1h45 including the build)
  • ostree btrfs grub BLS, full integration: all 34 plans passed (~2h15 including the build)
  • ostree xfs grub BLS, readonly: passed; bcvk now gets an explicit --filesystem=xfs there, which is the image's default anyway
  • cargo test -p xtask: 32 passed

Each bcvk install ran with --filesystem=btrfs and formatted the root with mkfs.btrfs, the ostree one included.

Fixes #2633

The Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com> on these commits was added on jmarrero's approval of the review draft: jmarrero-forge#15 (comment)

Generated-by: https://github.com/jmarrero-bot#llms

btrfs is Fedora's default root filesystem and supports fs-verity, so
composefs installs there get a strict command line, but no CI job has
ever installed onto it: the integration matrix only had ext4 and xfs.

Add it as a filesystem value and exclude it everywhere except Fedora
composefs, keeping one sealed UKI cell (the same plans as the other
sealed cells) and one GRUB BLS cell (the full integration set, like the
other BLS cells). Using excludes rather than include: entries matters
here: an included fedora-44 row would also be added on ci/tier-1 runs,
which only build centos-10 packages.

Closes: bootc-dev#2633

Generated-by: AI
Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
It was excluded in bb674f1 until 1.16.8, because older releases
deadlocked in the upgrade path (fixed by 71ad2d3, in 1.16.8). The
published Fedora 44 image has shipped newer bootc for months, so the
exclusion only hides coverage now.

Run it on btrfs, Fedora's default, which also covers an upgrade from
the published bootc on that filesystem. CentOS Stream keeps composefs
on ext4. The filesystem is now a matrix axis exported as
BOOTC_filesystem, which test-upgrade already passes to the composefs
install; ostree keeps the image's default (xfs) as before.

Generated-by: AI
Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
install_args only passed --filesystem with the composefs backend, so an
ostree run with BOOTC_filesystem=btrfs silently installed on the image's
default filesystem instead. Pass it whenever one is set; without one,
composefs still defaults to ext4 and ostree to the image's default. The
existing ostree CI cells set xfs, which is already their default.

The Fedora CoreOS xfs default now only applies when no filesystem was
asked for, so an ostree run that sets one doesn't pass both to bcvk.

Prep for an ostree btrfs CI cell.

Generated-by: AI
Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>
Fedora's own ostree installs (the Atomic desktops) sit on btrfs, while
the ostree cells only ever ran on xfs. Now that the xtask passes the
filesystem to bcvk for ostree, this cell really installs on btrfs.

Generated-by: AI
Signed-off-by: Joseph Marrero Corchado <jmarrero@redhat.com>

@cgwalters cgwalters left a comment

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.

LGTM but I think we've been past the point for quite a while where running the entire matrix on every PR is unreasonable; we keep adding straws to the camel's back here, I can't say this will be the one that breaks it but...

I think we can move about 70% of this matrix to opt-in and postsubmit + automated agentic-assisted reverts.

@jmarrero

jmarrero commented Nov 9, 2026

Copy link
Copy Markdown
Contributor

Let's map the minimum tests then we want on each PR? @jmarrero-bot take Colin's last comment and map the entire test matrix here in a new tracker issue in our forge. Then let's evaluate what would be the minimal tests we should include in each PR. Maybe even propose a way to run a set of tests depending of what area of the code is changed. Ideally with would not include agents making the decision and can be deterministic.

@jmarrero-bot

Copy link
Copy Markdown
Contributor Author

On it: jmarrero-forge/tracker#85 (full matrix map, a minimal per-PR set, and a deterministic path-based selection proposal).

@jmarrero
jmarrero merged commit 3269528 into bootc-dev:main Nov 10, 2026
69 of 71 checks passed
@jmarrero-bot jmarrero-bot moved this to Done in Workstream Nov 10, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/documentation Updates to the documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

ci: Cover btrfs on current Fedora

3 participants