Skip to content

Conversation

@mvo5
Copy link
Contributor

@mvo5 mvo5 commented Oct 7, 2025

This commit adds an image type to generate ova images from a bootc ref.

Once merged (and image-builder-cli is updated to use the new version of the images library) one can just do:

$ sudo image-builder build ova --bootc-ref quay.io/centos-bootc/centos-bootc:stream9
$ tar tvf bootc-centos-9-ova-x86_64/bootc-centos-9-ova-x86_64.ova
-rw-r--r-- root/root      5719 2025-10-07 17:16 disk.ovf
-rw-r--r-- root/root       167 2025-10-07 17:16 disk.mf
-rw-r--r-- root/root 1236157952 2025-10-07 17:16 disk.vmdk

This commit adds an image type to generate `ova` images from
a bootc ref.
With the addition of the OVA image type the previous slightly
simplistic generation of the filename does not longer work and
we need to add the filename explicitely to the bootc image types.
This is a bit sad that we need to duplicate the data between
`pkg/distro/bootc/bootc.go` and `pkg/image/bootc_disk.go` that
also hardcodes the filenames. Eventually we should get back to
this.
achilleas-k
achilleas-k previously approved these changes Oct 7, 2025
@achilleas-k achilleas-k changed the title distro: add ova image type for bootc distro: add ova image type for bootc [HMS-9503] Oct 8, 2025
bcl
bcl previously approved these changes Oct 9, 2025
Copy link
Contributor

@bcl bcl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

Copy link
Member

@supakeen supakeen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really requesting changes but I do want to clear this up. Is there a reason that we're using .tar as the extension here while we use .ova (which is a tar) for other ova-imagetypes?

Do any of the places where ova's get used expect a certain suffix?

mvo5 added 2 commits October 10, 2025 09:57
Use the (relatively) new newBootcDistroAfterIntrospect helper
in the existing NewTestBootcImageType to get a more realistic
bootc distro view. This is important for the `ova` test but
also benefits the existing tests.
@mvo5 mvo5 dismissed stale reviews from bcl and achilleas-k via b5c89bd October 10, 2025 08:17
@mvo5
Copy link
Contributor Author

mvo5 commented Oct 10, 2025

Not really requesting changes but I do want to clear this up. Is there a reason that we're using .tar as the extension here while we use .ova (which is a tar) for other ova-imagetypes?

Do any of the places where ova's get used expect a certain suffix?

Thanks for noticing! We had this name hardcoded in bib and I did not double check with the other image types - I agree, lets make it consistent, especially if there is image.ova since forever everywhere. Unfortuantely I had to tweak one or two more things to be able to make this change but it should be good now (and I added a test which is also more verbose than I would like, I will try to go into manifesttest again and see if we can improve this but that is for another PR :)

This commit changes the filename of the ova image to
`image.ova` to be consistent with the rest of the ova image
types.

Thanks for Simon for pointing this out.
@mvo5 mvo5 enabled auto-merge October 10, 2025 16:31
@mvo5 mvo5 added this pull request to the merge queue Oct 10, 2025
Merged via the queue into osbuild:main with commit bf0f7bc Oct 10, 2025
23 checks passed
@mvo5 mvo5 deleted the bootc-ova branch October 10, 2025 17:43
croissanne added a commit to croissanne/osbuild-composer that referenced this pull request Oct 21, 2025
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/images#1900)
    - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger
  - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/images#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/images#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/images#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/images#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/images#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/images#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/images#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/images#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/images#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/images#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/images#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/images#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/images#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/images#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/images#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/images#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/images#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
croissanne added a commit to croissanne/osbuild-composer that referenced this pull request Oct 21, 2025
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/images#1900)
    - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger
  - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/images#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/images#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/images#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/images#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/images#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/images#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/images#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/images#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/images#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/images#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/images#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/images#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/images#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/images#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/images#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/images#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/images#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
ondrejbudai pushed a commit to osbuild/osbuild-composer that referenced this pull request Oct 22, 2025
Changes with 0.205.0
----------------
  - Convert the test config map to a config list (osbuild/images#1900)
    - Author: Achilleas Koutsou, Reviewers: Sanne Raymaekers, Simon de Vlieger
  - Repos: Add definitions for AlmaLinux 9.7, 9.8, 10.1 and 10.2 (osbuild/images#1926)
    - Author: Eduard Abdullin, Reviewers: Achilleas Koutsou, Brian C. Lane, Simon de Vlieger
  - Support uploading to OpenStack (osbuild/images#1921)
    - Author: Jakub Kadlčík, Reviewers: Michael Vogt, Simon de Vlieger
  - disk: make addPartitionsForBootMode() arch specific (osbuild/images#1928)
    - Author: Michael Vogt, Reviewers: Brian C. Lane, Simon de Vlieger
  - distro: add ova image type for bootc [HMS-9503] (osbuild/images#1938)
    - Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - fedora/minimal: drop uuids in partition tables (osbuild/images#1932)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt

Changes with 0.206.0
----------------
  - Update osbuild dependency commit ID to latest (osbuild/images#1945)
    - Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - deps: bump blueprint to 1.16.0 (osbuild/images#1952)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Sanne Raymaekers
  - fedora: Drop tigervnc on F42 and later (osbuild/images#1942)
    - Author: Brian C. Lane, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: document root kickstart (osbuild/images#1936)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Michael Vogt
  - fedora: rawhide is 44 (osbuild/images#1943)
    - Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Tomáš Hozza
  - many: lorax template split (HMS-9524) (osbuild/images#1949)
    - Author: Simon de Vlieger, Reviewers: Brian C. Lane, Tomáš Hozza

Changes with 0.207.0
----------------
  - Enable fedora 43 unit testing (osbuild/images#1954)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - fedora: update cloud_kernel_options (osbuild/images#1953)
    - Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - test/data/repos/rhel-10.2: fix copy & paste error (osbuild/images#1956)
    - Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Simon de Vlieger

Changes with 0.208.0
----------------
  - Schutzfile: switch CI runner to Fedora 42 (osbuild/images#1955)
    - Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza
  - Support uploading to IBM Cloud (osbuild/images#1924)
    - Author: Jakub Kadlčík, Reviewers: Achilleas Koutsou, Simon de Vlieger
  - pkg/osbuild: generate osbuild result from status scanner entries (osbuild/images#1941)
    - Author: Sanne Raymaekers, Reviewers: Nobody
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.

4 participants