Skip to content

Justfile fixups #2611

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

Open
Rolv-Apneseth wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Justfile fixups #2611

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d833f81
justfile: fix tmt-vm-cleanup to use bcvk libvirt rm-all
Rolv-Apneseth Oct 30, 2026
1b6129a
justfile: forward build settings to nested recipes
Rolv-Apneseth Oct 30, 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: 30 additions & 11 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,23 @@ no_auto_local_deps := env("BOOTC_no_auto_local_deps", "")
nocache := env("BOOTC_nocache", "")
_nocache_arg := if nocache != "" { "--no-cache" } else { "" }
_baseconfigs_env := if baseconfigs != "" { "--env=BOOTC_baseconfigs=" + baseconfigs } else { "" }
# Build settings as `just` command line overrides, for forwarding to nested
# `just` invocations. Command line overrides only apply to a single
# invocation, so recipes which nest other recipes must pass
# the current settings along themselves. Exported BOOTC_* environment
# variables reach nested invocations on their own, so CI does not depend on
# this. Recipes which force a setting (e.g. variant=composefs) pass it after
# these, and the last override wins.
# https://just.systems/man/en/dependencies.html#running-recipes-in-the-middle-of-a-recipe
_forward_settings := "base_img=" + base_img + \
" base=" + base + \
" variant=" + variant + \
" bootloader=" + bootloader + \
" filesystem=" + filesystem + \
" boot_type=" + boot_type + \
" seal_state=" + seal_state + \
' baseconfigs="' + baseconfigs + '"' + \
" erofs_version=" + erofs_version
testimage_label := "bootc.testimage=1"
lbi_images := "quay.io/curl/curl:latest quay.io/curl/curl-base:latest registry.access.redhat.com/ubi9/podman:latest"
fedora-coreos := "quay.io/fedora/fedora-coreos:testing-devel"
Expand Down Expand Up @@ -185,13 +202,15 @@ list-variants:
# Build a sealed composefs image (alias for variant=composefs-sealeduki-sdboot)
[group('core')]
build-sealed:
@just --justfile {{justfile()}} variant=composefs bootloader=systemd boot_type=uki seal_state=sealed build
@just --justfile {{justfile()}} {{_forward_settings}} variant=composefs bootloader=systemd boot_type=uki seal_state=sealed build

# Run tmt integration tests in VMs (e.g. `just test-tmt readonly`)
[group('core')]
test-tmt *ARGS: build
@just _build-upgrade-image
@just test-tmt-nobuild {{ARGS}}
# Nested invocations do not inherit command line overrides, so the
# current settings are passed along explicitly (see _forward_settings).
@just {{_forward_settings}} _build-upgrade-image
@just {{_forward_settings}} test-tmt-nobuild {{ARGS}}

[group('testing')]
build-ukiboot-test-image: build
Expand Down Expand Up @@ -236,7 +255,7 @@ test-composefs bootloader filesystem boot_type seal_state *ARGS:
exit 1; \
fi

just variant=composefs \
just {{_forward_settings}} variant=composefs \
bootloader={{bootloader}} \
filesystem={{filesystem}} \
boot_type={{boot_type}} \
Expand Down Expand Up @@ -312,11 +331,11 @@ test-tmt-nobuild *ARGS:
cargo xtask run-tmt --env=BOOTC_variant={{variant}} --env=BOOTC_erofs_version={{erofs_version}} {{_baseconfigs_env}} --upgrade-image={{upgrade_img}} {{base_img}} {{ARGS}}

# Run readonly tests with a baseconfig baked into the image at build time.
# Requires composefs variant. Example: just variant=composefs test-tmt-baseconfig root-transient
# Requires composefs variant. Example: just test-tmt-baseconfig root-transient
[group('testing')]
test-tmt-baseconfig baseconfig *ARGS:
just variant=composefs baseconfigs={{baseconfig}} build
just variant=composefs baseconfigs={{baseconfig}} _build-upgrade-image
just {{_forward_settings}} variant=composefs baseconfigs={{baseconfig}} build
just {{_forward_settings}} variant=composefs baseconfigs={{baseconfig}} _build-upgrade-image
cargo xtask run-tmt \
--env=BOOTC_variant=composefs \
--env=BOOTC_erofs_version={{erofs_version}} \
Expand All @@ -330,9 +349,9 @@ test-tmt-baseconfig baseconfig *ARGS:
# Run readonly tests for all standard baseconfigs
[group('testing')]
test-baseconfigs *ARGS:
just test-tmt-baseconfig etc-transient {{ARGS}}
just test-tmt-baseconfig root-transient {{ARGS}}
just test-tmt-baseconfig var-volatile {{ARGS}}
just {{_forward_settings}} test-tmt-baseconfig etc-transient {{ARGS}}
just {{_forward_settings}} test-tmt-baseconfig root-transient {{ARGS}}
just {{_forward_settings}} test-tmt-baseconfig var-volatile {{ARGS}}

# Run tmt tests on Fedora CoreOS
[group('testing')]
Expand All @@ -347,7 +366,7 @@ run-container-external-tests:
# Remove all test VMs created by tmt tests
[group('testing')]
tmt-vm-cleanup:
bcvk libvirt rm --stop --force --label bootc.test=1
bcvk libvirt rm-all --stop --force --label bootc.test=1

# Build test image for Fedora CoreOS testing
[group('testing')]
Expand Down
Loading