Skip to content

Sync common files from infra repository#21

Closed
bootc-bot[bot] wants to merge 3909 commits intomainfrom
sync-common-files
Closed

Sync common files from infra repository#21
bootc-bot[bot] wants to merge 3909 commits intomainfrom
sync-common-files

Conversation

@bootc-bot
Copy link
Copy Markdown
Contributor

@bootc-bot bootc-bot bot commented Dec 2, 2025

Created by GitHub workflow (source).

This PR synchronizes common files from the infra repository.

Synchronized from bootc-dev/infra@56e4f61.

henrywang and others added 30 commits September 10, 2025 20:55
Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
ostree: Set parent of merge commit to base commit if present
- Removed `From<bytes::Parameter>` implementation for
  `utf8::Parameter` and similar for `utf8::ParameterKey`.  This was
  public and would allow end-users to construct utf8 parameters from
  non-utf8 data.  Replaced internally with `from_bytes` in the places
  where we know we can safely convert known-UTF-8 data.

- Added `TryFrom<bytes::Paramter>` implementation for
  `utf8::Parameter` to allow checked conversions, plus tests.

- Added `iter_utf8` and `find_utf8` to `bytes::Cmdline`, plus tests.

- Updated `find_root_args_to_inherit` in bootc to use these
  improvements.  Notably bootc will now allow non-UTF8 data in the
  kernel cmdline, *unless* it occurs in parameters that bootc is
  explicitly looking for.

- Added more tests to `find_root_args_to_inherit` to validate expected
  functionality with non-UTF-8 data.

- Fixed a parser bug that gemini pointed out with unmatched quotes,
  plus tests to check for that.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
kernel_cmdline: Refactor into separate `bytes` and `utf8` modules
test: Add integration test running on github runner
Add `add_or_modify` and `remove` methods to `Cmdline` in both `bytes`
and `utf8` modules, along with unit tests.

Closes: #1596
Signed-off-by: John Eckersberg <jeckersb@redhat.com>
kernel_cmdline: Add parameter manipulation methods
No functional changes, prep for further work.

Signed-off-by: Colin Walters <walters@verbum.org>
store: Move inner merge commit writing to a helper function
Over in bootc-dev/bootc#1607
I actually *just* deduplicated this code, but that isn't
ready to merge yet.

Signed-off-by: Colin Walters <walters@verbum.org>
integration: Copy distro-sync from main Dockerfile
See the updates to `Justfile` for how to use this.

Closes: #1428

Assisted-By: Claude Code (opus + sonnet)
Signed-off-by: Colin Walters <walters@verbum.org>
Switch to hand-written man pages with auto option sync
…sible

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
We already impl AsRef<str> but this just makes it more convenient to
render the command line for users.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
There's no reason these need to be owned.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
The (now-named) parse_one method is not particularly useful outside of
`CmdlineIter`.  Almost always end users don't care about extra
unparsed content, they just want the `Option<Parameter>`.

This greatly improves ergnomics for users so they can create
parameters like...

`Parameter::parse("foo=bar").unwrap()`

... knowing at the call-site that "foo=bar" is a valid parameter so
the `unwrap()` is safe.

Signed-off-by: John Eckersberg <jeckersb@redhat.com>
This adds a new off-by default feature to enable
a new composefs-native backend for bootc. This
is all still a live work in progress, but
we're landing this first tranche of work to help
avoid continual issues with rebasing.

Thanks to everyone who worked on it!

xref bootc-dev/bootc#1190

Co-authored-by: John Eckersberg <jeckersb@redhat.com>
Co-authored-by: Robert Sturla <robertsturla@outlook.com>
Co-authored-by: Colin Walters <walters@verbum.org>
Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
cmdline tweaks and improvements
I was hitting a compliation error which *looks*
like it was actaully an incremental compilation bug?
Or it might have been rust-analyzer and local builds
fighting over enabled features.

Anyways, this ensures that we're gating on the composefs
backend compiling.

Signed-off-by: Colin Walters <walters@verbum.org>
If we find UKI addons in the boot entries list, write them to ESP along
with the UKI

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
We don't need to write Grub menuentries for systemd-boot. For now the
operation is a no-op, but later we would want to have .conf files in
`ESP/loader/entries` so we can control the order of entries.

Regarding that, we would also need to place the UKIs in a separate
directory and not inside `ESP/EFI/Linux`, if we don't want duplicate
entries, as systemd-boot will simply list all .efi files placed in
EFI/Linux unconditionally

Signed-off-by: Pragyan Poudyal <pragyanpoudyal41999@gmail.com>
A key thing for me is that the `Justfile` should be a one-stop
shop for development of the project. It can't have everything but
it should answer the basic questions of "how do I build and test
this project".

This aligns the recently added tmt-on-GHA flow a *bit* more closely
with some of that. Biggest is to use the `just build-integration-test-image` as the canonical
way to build a container image with our testing stuff in it;
which uses our main Dockerfile

Other cleanups:
- Change test script to move into tests/tmt/ as a workaround for
  teemtee/tmt#3037 (comment)
- Change the qemu logic to use SMBIOS credentials so we don't
  have to carry around both a disk image and a SSH key
- Change qemu to use `-snapshot` so we can reuse disks
- Change the scripts to accept data via argv[1] and not environment
- Drop the hardcoded testing directory and use `target/` as
  a generic build artifact dir

Signed-off-by: Colin Walters <walters@verbum.org>
Followup to bootc-dev/bootc#1587
Closes: bootc-dev/bootc#1616

Signed-off-by: Colin Walters <walters@verbum.org>
This should reduce the flake rate.

Signed-off-by: Colin Walters <walters@verbum.org>
- Remove duplicated logic between xtask and makefile
  for converting markdown; it needs to be in xtask
  as we handle the version substitution there and
  some other tweaks
- Really just make the developer entrypoint `just update-generated`
  in general
- Fix the rendering of booleans
- Remove unnecessary emoji from prints

Signed-off-by: Colin Walters <walters@verbum.org>
I broke this a while ago.

Signed-off-by: Colin Walters <walters@verbum.org>
cgwalters and others added 6 commits November 21, 2025 15:29
Otherwise we compile many dependencies twice unnecessarily.

Signed-off-by: Colin Walters <walters@verbum.org>
To make it easier to do upgrade tests.

Signed-off-by: Colin Walters <walters@verbum.org>
This ensures it all can work much more elegantly/naturally
with sealed UKI builds - we don't want to do the build-on-target
thing.

Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Colin Walters <walters@verbum.org>
1. Fix variable issue in test-bound-storage
2. Fix permission issue in logically-bound-switch,
   image-pushpull-upgrade, soft-reboot and custom-selinux-policy

Signed-off-by: Xiaofeng Wang <henrywangxf@me.com>
@bootc-bot bootc-bot bot requested a review from jmarrero December 2, 2025 15:56
@bootc-bot bootc-bot bot force-pushed the sync-common-files branch 4 times, most recently from c5b51d0 to 08a951e Compare December 19, 2025 18:55
@bootc-bot bootc-bot bot force-pushed the sync-common-files branch 3 times, most recently from 9e7de37 to 7f5901e Compare January 15, 2026 23:15
@bootc-bot bootc-bot bot force-pushed the sync-common-files branch 2 times, most recently from de6f456 to f420dd7 Compare January 28, 2026 21:59
Add a workflow_dispatch-triggered workflow for interactive debugging
on arm64 GitHub runners using action-upterm for SSH access.

This is for investigating the bootc-ubuntu-setup failure on arm64
where the plucky apt repository uses the wrong mirror URL
(azure.archive.ubuntu.com instead of ports.ubuntu.com).

See: https://github.com/cgwalters/service-gator/actions/runs/21484445531

Assisted-by: OpenCode (Claude claude-opus-4-5)
Test the proposed fix for the bootc-ubuntu-setup action on arm64.
The issue is that azure.archive.ubuntu.com only hosts amd64 packages,
so arm64 needs to use ports.ubuntu.com/ubuntu-ports instead.

Assisted-by: OpenCode (Claude claude-opus-4-5)
Copy the bootc-ubuntu-setup action locally and fix:
1. Use correct apt mirror for arm64 (ports.ubuntu.com/ubuntu-ports)
2. Handle missing /dev/kvm on arm64 runners gracefully

Also syncs other improvements from upstream actions repo.

Assisted-by: OpenCode (Claude claude-opus-4-5)
@bootc-bot bootc-bot bot force-pushed the sync-common-files branch 4 times, most recently from a8e1fd3 to d64e112 Compare March 3, 2026 19:22
@bootc-bot bootc-bot bot force-pushed the sync-common-files branch 3 times, most recently from 9767e1c to ca43f0d Compare March 16, 2026 08:40
Synchronized from bootc-dev/infra@56e4f61.

Signed-off-by: bootc-dev Bot <bot@bootc.dev>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.