Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 5 additions & 4 deletions .github/workflows/ci-local.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
name: CI (ThinFloe)

# ThinFloe's own CI jobs, called from ci.yml (docs/release-ci.md, "CI
# split"). `unit` gives a result within minutes; `image` builds the rootfs
# once and runs the integration tests, the image, the nine QEMU smoke tests
# split"). `unit` runs the unit tests and gives a result within minutes;
# `image` builds the rootfs once and runs the integration tests (not the unit
# tests again), the image, the nine QEMU smoke tests
# and the runtime tests on it. scripts/ci-runner-setup.sh prepares the
# runner (docs/release-ci.md, "Runner setup for the project's workflows").
on:
Expand Down Expand Up @@ -48,8 +49,8 @@ jobs:
- name: Prepare the runner
run: scripts/ci-runner-setup.sh all

- name: make test
run: make test MEMCAP=
- name: make test-integration
run: make test-integration MEMCAP=

- name: make image
run: make image MEMCAP=
Expand Down
3 changes: 2 additions & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ Boot in short: syslinux loads the kernel with `ramroot=` (a path on the stick's
make image # all stages, bootable files in artifacts/
make rootfs # Ubuntu container; kernel, initrd, ramroot.sqsh to artifacts/rootfs/
make ipxe # iPXE loaders to artifacts/rootfs/
make test # test-unit, then the integration tests against the built image
make test # test-unit, then test-integration
make test-integration # the integration tests alone against the built image (CI's image job)
make test-unit # Python unit tests in test/unit/ and the menu's cargo test
make test-runtime # labwc and the menu headless
make qemu-smoke # boot the USB image in QEMU (also: -addons, -write, -upgrade,
Expand Down
10 changes: 7 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ QEMU_EXTRA_ARGS ?=
QEMU_XRES ?= 1920
QEMU_YRES ?= 1080

.PHONY: all clean rootfs image ipxe qemu-test qemu-smoke qemu-smoke-netboot qemu-smoke-timezone qemu-smoke-timezone-netboot qemu-smoke-upgrade qemu-smoke-addons qemu-smoke-two-sticks qemu-smoke-write qemu-smoke-grow release-assets test-unit test test-runtime help
.PHONY: all clean rootfs image ipxe qemu-test qemu-smoke qemu-smoke-netboot qemu-smoke-timezone qemu-smoke-timezone-netboot qemu-smoke-upgrade qemu-smoke-addons qemu-smoke-two-sticks qemu-smoke-write qemu-smoke-grow release-assets test-unit test-integration test test-runtime help

all: image
@echo "✓ Build complete!"
Expand All @@ -142,7 +142,8 @@ help:
@echo " qemu-smoke-write - Headless write of a USB stick from a boot server, then boot it"
@echo " qemu-smoke-grow - Two headless boots of an 8 GB stick: the ESP grows once"
@echo " test-unit - Run offline unit tests (no rootfs needed)"
@echo " test - Run integration guard tests against rootfs"
@echo " test-integration - Run integration guard tests against rootfs"
@echo " test - test-unit, then test-integration"
@echo " test-runtime - Run runtime session tests (needs network, compositor)"
@echo " clean - Remove artifacts (FORCE=1 if artifacts is a symlink)"
@echo " help - Show this help"
Expand Down Expand Up @@ -598,7 +599,9 @@ test-unit:
@$(TEST_ENV) python3 -m unittest discover -s test/unit -v
cd $(MENU_DIR) && $(TEST_ENV) CARGO_BUILD_JOBS=$(BUILD_JOBS) $(MEMCAP) cargo test --locked -j $(BUILD_JOBS) -- --test-threads=$(TEST_THREADS)

test: test-unit rootfs
test: test-unit test-integration

test-integration: rootfs
@mkdir -p '$(TEST_TMPDIR)'
@$(TEST_ENV) test/integration/test-firmware.sh
@$(TEST_ENV) test/integration/test-wifi-stack.sh
Expand Down Expand Up @@ -637,6 +640,7 @@ test: test-unit rootfs
@$(TEST_ENV) test/integration/test-make-mounts.sh
@$(TEST_ENV) TF_UBUNTU_IMAGE=$(UBUNTU_IMAGE) test/integration/test-addon-deps.sh
@$(TEST_ENV) TF_UBUNTU_IMAGE=$(UBUNTU_IMAGE) test/integration/test-network-netplan.sh
@$(TEST_ENV) test/integration/test-make-targets.sh

# Runtime session tests. Needs network (installs python3-xlib into a
# test-only image) and runs a compositor, so it is deliberately not part of
Expand Down
3 changes: 2 additions & 1 deletion docs/release-ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ The split changes as follows (decision 17, revised 2026-11-12):
- `ci.yml` (every pull request, every push to `main`, the release branch)
runs two jobs through `ci-local.yml`:
- `unit`: `make test-unit MEMCAP=`, for a result within minutes.
- `image`: `make test MEMCAP=`, `make image`, the nine smoke targets, and
- `image`: `make test-integration MEMCAP=` (the unit tests run only in
`unit`), `make image`, the nine smoke targets, and
`make test-runtime`, in one job so the rootfs is built once. About 25
minutes.
- `release-build.yml` stays as decision 17 describes it: `make image` with
Expand Down
Loading
Loading