Page MenuHomeFreeBSD

release: unbreak podman merged image generation
Needs ReviewPublic

Authored by dch on Mon, Sep 22, 9:38 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Oct 10, 4:10 PM
Unknown Object (File)
Fri, Oct 10, 4:10 PM
Unknown Object (File)
Fri, Oct 10, 10:15 AM
Unknown Object (File)
Thu, Oct 9, 8:32 PM
Unknown Object (File)
Mon, Oct 6, 10:20 PM
Unknown Object (File)
Sat, Oct 4, 2:35 AM
Unknown Object (File)
Fri, Oct 3, 4:39 AM
Unknown Object (File)
Fri, Oct 3, 2:31 AM
Subscribers

Details

Reviewers
dfr
cperciva
emaste
Group Reviewers
releng
Summary

Ensure there is no overlap of names used to generate OCI images.

The release tooling uses globs to filter and select files for merging
into the architecture-independent images. The previous naming used
"toolchain", which is a strict subset of "notoolchain", and broke the
expected glob result, by returning multiple names.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Skipped
Unit
Tests Skipped
Build Status
Buildable 67235
Build 64118: arc lint + arc unit

Event Timeline

dch requested review of this revision.Mon, Sep 22, 9:38 AM

LGTM here. I failed to get thermite to run at all, but the only change should be to amend:

45:oci_images="static dynamic runtime no-toolchain with-toolchain"

A local podmanic loop ran fine:

for r in 15.0-ALPHA3
  for t in static dynamic runtime with-toolchain no-toolchain
    doas podmanic \
      /usr/obj/usr/src/arm64.aarch64/release/container-image-$t.txz \
      /usr/obj/usr/src/amd64.amd64/release/container-image-$t.txz \
      cr.skunkwerks.at/freebsd-$t:(string lower $r) cr.skunkwerks.at/freebsd-$t:15.snap
  end
end
# podman image search --list-tags cr.skunkwerks.at/freebsd-with-toolchain
NAME                                     TAG
cr.skunkwerks.at/freebsd-with-toolchain  15.snap
cr.skunkwerks.at/freebsd-with-toolchain  15.0-alpha3
# podman image search --list-tags cr.skunkwerks.at/freebsd-no-toolchain
NAME                                   TAG
cr.skunkwerks.at/freebsd-no-toolchain  15.0-alpha3
cr.skunkwerks.at/freebsd-no-toolchain  15.snap