Skip to content

distro: add ova image type for bootc [HMS-9503] #1938

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

Merged
mvo5 merged 5 commits into from
Oct 10, 2025
Merged

distro: add ova image type for bootc [HMS-9503] #1938

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96071e4
distro: add `ova` image type for bootc
mvo5 Oct 7, 2025
8c7def1
distro: update bootc image types filenames
mvo5 Oct 7, 2025
056ce6a
manifesttest: add manifest.Pipeline(name) helper
mvo5 Oct 10, 2025
8b37cda
bootc: re-use newBootcDistroAfterIntrospect in tests
mvo5 Oct 10, 2025
20af81a
bootc: rename "ova" image filename to "image.ova"
mvo5 Oct 10, 2025
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
50 changes: 27 additions & 23 deletions pkg/distro/bootc/bootc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ var _ = distro.ImageType(&BootcImageType{})
type BootcImageType struct {
arch *BootcArch

name string
export string
// file extension
ext string
name string
export string
filename string
}

func (d *BootcDistro) SetBuildContainer(imgref string) (err error) {
Expand Down Expand Up @@ -215,7 +214,7 @@ func (t *BootcImageType) Arch() distro.Arch {
}

func (t *BootcImageType) Filename() string {
return fmt.Sprintf("disk.%s", t.ext)
return t.filename
}

func (t *BootcImageType) MIMEType() string {
Expand Down Expand Up @@ -453,34 +452,39 @@ func newBootcDistroAfterIntrospect(archStr string, info *osinfo.Info, imgref, de
// XXX: find a way to avoid this duplication
ba.addImageTypes(
BootcImageType{
name: "ami",
export: "image",
ext: "raw",
name: "ami",
export: "image",
filename: "disk.raw",
},
BootcImageType{
name: "qcow2",
export: "qcow2",
ext: "qcow2",
name: "qcow2",
export: "qcow2",
filename: "disk.qcow2",
},
BootcImageType{
name: "raw",
export: "image",
ext: "raw",
name: "raw",
export: "image",
filename: "disk.raw",
},
BootcImageType{
name: "vmdk",
export: "vmdk",
ext: "vmdk",
name: "vmdk",
export: "vmdk",
filename: "disk.vmdk",
},
BootcImageType{
name: "vhd",
export: "bpc",
ext: "vhd",
name: "vhd",
export: "bpc",
filename: "disk.vhd",
},
BootcImageType{
name: "gce",
export: "gce",
ext: "tar.gz",
name: "gce",
export: "gce",
filename: "image.tar.gz",
},
BootcImageType{
name: "ova",
export: "archive",
filename: "disk.tar",
},
)
bd.addArches(ba)
Expand Down
8 changes: 4 additions & 4 deletions pkg/distro/bootc/export_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ func NewTestBootcImageType() *BootcImageType {
}

imgType := &BootcImageType{
arch: a,
name: "qcow2",
export: "qcow2",
ext: "qcow2",
arch: a,
name: "qcow2",
export: "qcow2",
filename: "disk.qcow2",
}
a.addImageTypes(*imgType)

Expand Down
1 change: 0 additions & 1 deletion pkg/image/bootc_disk.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@ func (img *BootcDiskImage) InstantiateManifestFromContainers(m *manifest.Manifes
fmt.Sprintf("%s.ovf", fileBasename),
fmt.Sprintf("%s.mf", fileBasename),
fmt.Sprintf("%s.vmdk", fileBasename),
fmt.Sprintf("%s.vhd", fileBasename),
}

gcePipeline := newGCETarPipelineForImg(buildPipeline, rawImage, "gce")
Expand Down
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-aarch64-ami-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b8a2e3722b12d0327672c2ff1765c0e6cbd355df
db98e4d9254122294db095f4c55140e623ad5fd9
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-aarch64-gce-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3c444830b05ee7e9bbf7a44494701130087e0ed0
d5e1de34b3175165132947142590f83ef10bfc4b
1 change: 1 addition & 0 deletions test/data/manifest-checksums/bootc_test_os_1-aarch64-ova-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
43d192ebc49c53e4c12c316d3ec6faf4b14f5b96
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-aarch64-qcow2-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
22d208e39a11ba5feb8f586be9b3b9f8257f8263
8576706fc3b27fb1e0c8bebf897e0bbd78eb7af5
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-aarch64-raw-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f4f2f3508999911db0befd41b6429ae0c0a525ab
0e890ac56799d31fc6a7d1e8a7bc31be41dae5cd
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-aarch64-vhd-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5b3da86b3a2abfafe5cb2d3de4acfa01ab4beebb
090ec3470c8246e3d45e9c5991b4cf677309f09c
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-aarch64-vmdk-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6a70959d7e673cde56b11b89785a2ac9dec7106c
a622fd5846d8a549b96886f278ce2c597a027bfc
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-ppc64le-ami-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b7ddbad816724cb66eec36cf7ca2b643d15f4c9d
1c507b4f2763f6a9ed7602cd2613cd30459f69a6
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-ppc64le-gce-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ad12dee18e7f6e33b076b9377c1fd1879dcead7e
1b28b5073b37bb8d53dee77c956fcb829b4c9645
1 change: 1 addition & 0 deletions test/data/manifest-checksums/bootc_test_os_1-ppc64le-ova-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
205316d8194e3fa04bdc47282bf3ec54e1390c20
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-ppc64le-qcow2-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
14d6cffd05250e0b6ac1113aa2a5cb1ccb3b33d2
36d317cb7abc81e81703f4ddac9380f905e103fa
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-ppc64le-raw-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
49ad8d143bbbf96bce01a029745e7bfba4d7b900
31c5812bd57498d9b9db5c7dedcbd25ba9f87d1d
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-ppc64le-vhd-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2d31fe3c4c747c4b5ae3094bf4182ecc8dc7caeb
fe0ed63e7913e20632d78708510d047e3de64688
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-ppc64le-vmdk-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
498f8bde1ec3ce0f704fe98ec4f8050d850d73f4
9e384c01ea25dc5c773e4b16c8ada0023257dc7e
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-s390x-ami-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
54bf9201635e54806ddea4cda2947fd99d7c276c
b9ccb52b440bb0105568a47b2fc5ed16d58ab0c0
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-s390x-gce-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c1ef1aac4823032a85371c75a111638c37e31ffe
07e88285bbbf84de68adc3a390b0e10403524f06
1 change: 1 addition & 0 deletions test/data/manifest-checksums/bootc_test_os_1-s390x-ova-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
c2b7c7a98a524f068ebe4b39e488f3c76258a4ed
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-s390x-qcow2-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
554badbf13db66e073446315b25c8dd8ac974a9e
6928fe19a9b7c3103903a688aafe6c37b57ed39e
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-s390x-raw-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
465de5127abee6828a1b60a280b8630f9ac5457a
351952f443a497d68eae1fc455c6b73e08725c78
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-s390x-vhd-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ff19bdec8c095f3d146e84498877932249aded4a
83a61288c0e9fea0f85de8ef08e78ed5d3ff04d8
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-s390x-vmdk-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d634826c27a2993ef59e6bfa5a764219b2a83325
76a644b79121183396937d1aa58af79e77f0c361
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-x86_64-ami-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eece2136444b81ffec6edcfb4f14f69ab7218ed4
234def85527dcf65300ebd2ebaac4d7f6f69d5ed
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-x86_64-gce-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a6df8aa5feae6b9f7c35dc805baadcf292258896
586905d2b8b4c7ff7f1a33b22a66c6cec5c094ca
1 change: 1 addition & 0 deletions test/data/manifest-checksums/bootc_test_os_1-x86_64-ova-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5a290f53b8746fda9b93c7eb5f124a557276b702
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-x86_64-qcow2-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6dc585a8846922b1d1486af70f124fb3026f20db
e7da08f39117121d10343edddc05141e75f367f8
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-x86_64-raw-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f73b578193e4b8f3fca9a7c9d408791237cadb9
a29e7377b21815d30a8424848e69dc0decf801ba
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-x86_64-vhd-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
31b7b9f7874a1d94d656028ed06a7fbcf04b9a90
40837f4b551d1d39534463c773c0f3e9cf665b84
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_1-x86_64-vmdk-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c2ffb4e140c7927fc51af604abd42e58e407e536
305ee1e9fa1ec7389677cb42e72abdc294d52a9a
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-ami-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3acf7e43d917fba754c7dddc6ad793616ff54cce
e3f039baf41717d49c6951a3adf3206531eb7865
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-gce-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
46ec6c72dc9942552f2fdab02ae0a1b3950954a8
72104b87481905a0239d7a3b0fb932a698985325
1 change: 1 addition & 0 deletions test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-ova-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
26c3839beae2d27631f8e9d6d3bd294ec03cbec9
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-qcow2-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e2d3eca009d3276d5cc286df48f2c2d9b99aaecc
fa79524c5d83428566535470226b065af9d5943b
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-raw-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7f6896bf5f7437f01a08b417077c7f647eea22a3
f4184ad2062214e525ffc7ce5c672e953963ad08
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-vhd-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ed2b094ebe4646ad8a305173251128c251de9bf9
83e0cf72f799515b7bc9696dd7cdcbdff58d972f
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/bootc_test_os_with_build_container_1-x86_64-vmdk-empty
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a8365d782f5261d21d8e17a947d20faca2422ffe
848420b4a7a296f597094ff76a448b3541e6700a
Loading