From 7d18d21107245bd27e10121961f71151d6b1b318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 12:13:20 +0100 Subject: [PATCH 1/7] cmd/check-host-config: add container embedding check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Verify that containers listed in the blueprint are actually present in the booted image's podman storage. Signed-off-by: Tomáš Hozza --- .../check/container_embedding.go | 71 +++++++++++ .../check/container_embedding_test.go | 117 ++++++++++++++++++ 2 files changed, 188 insertions(+) create mode 100644 cmd/check-host-config/check/container_embedding.go create mode 100644 cmd/check-host-config/check/container_embedding_test.go diff --git a/cmd/check-host-config/check/container_embedding.go b/cmd/check-host-config/check/container_embedding.go new file mode 100644 index 0000000000..7dc54664b5 --- /dev/null +++ b/cmd/check-host-config/check/container_embedding.go @@ -0,0 +1,71 @@ +package check + +import ( + "encoding/json" + "fmt" + "log" + "strings" + + "github.com/osbuild/images/internal/buildconfig" +) + +func init() { + RegisterCheck(Metadata{ + Name: "container-embedding", + RequiresBlueprint: true, + }, containerEmbeddingCheck) +} + +type podmanImage struct { + Names []string `json:"Names"` +} + +func containerEmbeddingCheck(meta *Metadata, config *buildconfig.BuildConfig) error { + containers := config.Blueprint.Containers + if len(containers) == 0 { + return Skip("no containers to check") + } + + stdout, _, _, err := Exec("sudo", "podman", "images", "--format", "json") + if err != nil { + return Fail("failed to list podman images:", err) + } + + var images []podmanImage + if err := json.Unmarshal(stdout, &images); err != nil { + return Fail("failed to parse podman images output:", err) + } + + for _, ctr := range containers { + // The blueprint Name, when set, is used as the local name for the + // container in the image storage (see Spec.LocalName). When empty, + // the source reference is used instead. + needle := ctr.Source + if ctr.Name != "" { + needle = ctr.Name + } + if needle == "" { + continue + } + + found := false + for _, img := range images { + for _, name := range img.Names { + if strings.HasPrefix(name, needle) { + found = true + break + } + } + if found { + break + } + } + + if !found { + return Fail(fmt.Sprintf("embedded container %q (source %q) not found in podman images", needle, ctr.Source)) + } + log.Printf("Container %q found in podman images\n", needle) + } + + return Pass() +} diff --git a/cmd/check-host-config/check/container_embedding_test.go b/cmd/check-host-config/check/container_embedding_test.go new file mode 100644 index 0000000000..7964466c9f --- /dev/null +++ b/cmd/check-host-config/check/container_embedding_test.go @@ -0,0 +1,117 @@ +package check_test + +import ( + "errors" + "testing" + + "github.com/osbuild/blueprint/pkg/blueprint" + check "github.com/osbuild/images/cmd/check-host-config/check" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestContainerEmbeddingCheck(t *testing.T) { + tests := []struct { + name string + containers []blueprint.Container + mockExec map[string]ExecResult + wantErr error + }{ + { + name: "skip when no containers", + containers: nil, + wantErr: check.ErrCheckSkipped, + }, + { + name: "pass when container is found", + containers: []blueprint.Container{ + {Source: "registry.example.com/test"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman images --format json": { + Stdout: []byte(`[{"Names":["registry.example.com/test:latest"]}]`), + }, + }, + }, + { + name: "fail when container is not found", + containers: []blueprint.Container{ + {Source: "registry.example.com/missing"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman images --format json": { + Stdout: []byte(`[{"Names":["registry.example.com/other:latest"]}]`), + }, + }, + wantErr: check.ErrCheckFailed, + }, + { + name: "fail when podman command fails", + containers: []blueprint.Container{ + {Source: "registry.example.com/test"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman images --format json": { + Err: errors.New("podman not found"), + }, + }, + wantErr: check.ErrCheckFailed, + }, + { + name: "pass with multiple containers", + containers: []blueprint.Container{ + {Source: "registry.example.com/first"}, + {Source: "registry.example.com/second"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman images --format json": { + Stdout: []byte(`[{"Names":["registry.example.com/first:latest"]},{"Names":["registry.example.com/second:v1"]}]`), + }, + }, + }, + { + name: "pass when custom name matches", + containers: []blueprint.Container{ + {Source: "registry.example.com/source-image", Name: "custom-name:v1"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman images --format json": { + Stdout: []byte(`[{"Names":["custom-name:v1"]}]`), + }, + }, + }, + { + name: "fail when custom name does not match", + containers: []blueprint.Container{ + {Source: "registry.example.com/source-image", Name: "custom-name:v1"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman images --format json": { + Stdout: []byte(`[{"Names":["registry.example.com/source-image:latest"]}]`), + }, + }, + wantErr: check.ErrCheckFailed, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + installMockExec(t, tt.mockExec) + + chk, found := check.FindCheckByName("container-embedding") + require.True(t, found, "container-embedding check not found") + + config := buildConfigWithBlueprint(func(bp *blueprint.Blueprint) { + bp.Containers = tt.containers + }) + + err := chk.Func(chk.Meta, config) + if tt.wantErr != nil { + require.Error(t, err) + assert.True(t, errors.Is(err, tt.wantErr)) + } else { + require.NoError(t, err) + } + }) + } +} From 9f4d1ac67a34ba5c25e5981872f80d64be0510e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 12:14:15 +0100 Subject: [PATCH 2/7] cmd/check-host-config: add podman network backend consistency check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Verify that rootful and rootless podman report the same network backend. When containers are embedded as root into the image (the default behavior), some podman versions interpret the existing storage as a migration and fall back to 'cni' for rootful only, leaving rootless on 'netavark'. In practice, the desired behavior is that podman uses the same network backend, regardless if there is an embedded container or not. Signed-off-by: Tomáš Hozza --- .../check/podman_network_backend.go | 74 ++++++++++++++++ .../check/podman_network_backend_test.go | 88 +++++++++++++++++++ 2 files changed, 162 insertions(+) create mode 100644 cmd/check-host-config/check/podman_network_backend.go create mode 100644 cmd/check-host-config/check/podman_network_backend_test.go diff --git a/cmd/check-host-config/check/podman_network_backend.go b/cmd/check-host-config/check/podman_network_backend.go new file mode 100644 index 0000000000..436d97e65d --- /dev/null +++ b/cmd/check-host-config/check/podman_network_backend.go @@ -0,0 +1,74 @@ +package check + +import ( + "encoding/json" + "log" + + "github.com/osbuild/images/internal/buildconfig" +) + +func init() { + RegisterCheck(Metadata{ + Name: "podman-network-backend", + RequiresBlueprint: true, + }, podmanNetworkBackendCheck) +} + +type podmanInfo struct { + Host struct { + NetworkBackend string `json:"networkBackend"` + } `json:"host"` +} + +func getPodmanNetworkBackend(sudo bool) (string, error) { + var stdout []byte + var err error + + if sudo { + stdout, _, _, err = Exec("sudo", "podman", "info", "--format", "json") + } else { + stdout, _, _, err = Exec("podman", "info", "--format", "json") + } + if err != nil { + return "", err + } + + var info podmanInfo + if err := json.Unmarshal(stdout, &info); err != nil { + return "", err + } + + backend := info.Host.NetworkBackend + if backend == "" { + backend = "undefined" + } + return backend, nil +} + +// podmanNetworkBackendCheck verifies that rootful and rootless podman use the +// same network backend. When containers are embedded into the image as root, +// certain podman versions may interpret the existing storage as a migration +// and fall back to 'cni' for rootful only, creating an inconsistency. +func podmanNetworkBackendCheck(meta *Metadata, config *buildconfig.BuildConfig) error { + if len(config.Blueprint.Containers) == 0 { + return Skip("no embedded containers") + } + + rootful, err := getPodmanNetworkBackend(true) + if err != nil { + return Fail("failed to get rootful podman network backend:", err) + } + log.Printf("Rootful podman network backend: %s\n", rootful) + + rootless, err := getPodmanNetworkBackend(false) + if err != nil { + return Fail("failed to get rootless podman network backend:", err) + } + log.Printf("Rootless podman network backend: %s\n", rootless) + + if rootful != rootless { + return Fail("podman network backends are inconsistent: rootful="+rootful, "rootless="+rootless) + } + + return Pass() +} diff --git a/cmd/check-host-config/check/podman_network_backend_test.go b/cmd/check-host-config/check/podman_network_backend_test.go new file mode 100644 index 0000000000..b17892c2c4 --- /dev/null +++ b/cmd/check-host-config/check/podman_network_backend_test.go @@ -0,0 +1,88 @@ +package check_test + +import ( + "errors" + "testing" + + "github.com/osbuild/blueprint/pkg/blueprint" + check "github.com/osbuild/images/cmd/check-host-config/check" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" +) + +func TestPodmanNetworkBackendCheck(t *testing.T) { + tests := []struct { + name string + containers []blueprint.Container + mockExec map[string]ExecResult + wantErr error + }{ + { + name: "skip when no containers", + containers: nil, + wantErr: check.ErrCheckSkipped, + }, + { + name: "pass when backends match", + containers: []blueprint.Container{ + {Source: "registry.example.com/test"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman info --format json": { + Stdout: []byte(`{"host":{"networkBackend":"netavark"}}`), + }, + "podman info --format json": { + Stdout: []byte(`{"host":{"networkBackend":"netavark"}}`), + }, + }, + }, + { + name: "fail when backends differ", + containers: []blueprint.Container{ + {Source: "registry.example.com/test"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman info --format json": { + Stdout: []byte(`{"host":{"networkBackend":"cni"}}`), + }, + "podman info --format json": { + Stdout: []byte(`{"host":{"networkBackend":"netavark"}}`), + }, + }, + wantErr: check.ErrCheckFailed, + }, + { + name: "fail when rootful podman command fails", + containers: []blueprint.Container{ + {Source: "registry.example.com/test"}, + }, + mockExec: map[string]ExecResult{ + "sudo podman info --format json": { + Err: errors.New("podman not found"), + }, + }, + wantErr: check.ErrCheckFailed, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + installMockExec(t, tt.mockExec) + + chk, found := check.FindCheckByName("podman-network-backend") + require.True(t, found, "podman-network-backend check not found") + + config := buildConfigWithBlueprint(func(bp *blueprint.Blueprint) { + bp.Containers = tt.containers + }) + + err := chk.Func(chk.Meta, config) + if tt.wantErr != nil { + require.Error(t, err) + assert.True(t, errors.Is(err, tt.wantErr)) + } else { + require.NoError(t, err) + } + }) + } +} From 6c8650c8c6eebf244f9932bc2401bc4a96af1337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 11:42:21 +0100 Subject: [PATCH 3/7] pkg/container: add podman default network backend file generation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Certain versions of Podman (notably on RHEL 9) fall back to the legacy 'cni' network backend when they find existing container images in the system storage, assuming a migration from an older version. This is problematic for disk images that embed containers as a customization, because the legacy backend packages are not installed by default. Add a NetworkBackend type and a helper to generate the /var/lib/containers/storage/defaultNetworkBackend file, which tells Podman which backend to use and prevents the unwanted fallback. Signed-off-by: Tomáš Hozza --- pkg/container/podman.go | 26 ++++++++++++++++++++++++ pkg/container/podman_test.go | 39 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+) create mode 100644 pkg/container/podman.go create mode 100644 pkg/container/podman_test.go diff --git a/pkg/container/podman.go b/pkg/container/podman.go new file mode 100644 index 0000000000..a6809b148b --- /dev/null +++ b/pkg/container/podman.go @@ -0,0 +1,26 @@ +package container + +import "github.com/osbuild/images/pkg/customizations/fsnode" + +// NetworkBackend is the type of network backend used by Podman. +type NetworkBackend string + +const ( + NetworkBackendCNI NetworkBackend = "cni" + NetworkBackendNetavark NetworkBackend = "netavark" +) + +// GenDefaultNetworkBackendFile creates an fsnode.File that writes the given +// network backend name to /var/lib/containers/storage/defaultNetworkBackend. +// +// Certain versions of Podman fall back to 'cni' when they find existing +// container images in the system storage, assuming a migration from an older +// version. Writing this file prevents that behavior and forces Podman to use +// the specified backend. +func GenDefaultNetworkBackendFile(backend NetworkBackend) (*fsnode.File, error) { + file, err := fsnode.NewFile("/var/lib/containers/storage/defaultNetworkBackend", nil, nil, nil, []byte(backend)) + if err != nil { + return nil, err + } + return file, nil +} diff --git a/pkg/container/podman_test.go b/pkg/container/podman_test.go new file mode 100644 index 0000000000..591c44b3f0 --- /dev/null +++ b/pkg/container/podman_test.go @@ -0,0 +1,39 @@ +package container_test + +import ( + "testing" + + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/osbuild/images/pkg/container" +) + +func TestGenDefaultNetworkBackendFile(t *testing.T) { + tests := []struct { + name string + backend container.NetworkBackend + expectedContent string + }{ + { + name: "netavark backend", + backend: container.NetworkBackendNetavark, + expectedContent: "netavark", + }, + { + name: "cni backend", + backend: container.NetworkBackendCNI, + expectedContent: "cni", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + file, err := container.GenDefaultNetworkBackendFile(tt.backend) + require.NoError(t, err) + require.NotNil(t, file) + assert.Equal(t, "/var/lib/containers/storage/defaultNetworkBackend", file.Path()) + assert.Equal(t, []byte(tt.expectedContent), file.Data()) + }) + } +} From fab1ff35a3dc55f397de307c7a1923381b3056bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 11:53:19 +0100 Subject: [PATCH 4/7] pkg/distro: add PodmanDefaultNetBackend to ImageConfig and wire it up MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a new ImageConfig option that specifies the default network backend for Podman. When set and the image embeds container images, the value is written to /var/lib/containers/storage/defaultNetworkBackend during image build. This prevents Podman from falling back to the legacy 'cni' backend when it finds pre-existing container images in storage, which it interprets as a system migration. Signed-off-by: Tomáš Hozza --- pkg/distro/generic/images.go | 8 ++++++++ pkg/distro/image_config.go | 10 ++++++++++ 2 files changed, 18 insertions(+) diff --git a/pkg/distro/generic/images.go b/pkg/distro/generic/images.go index 9b42304eb3..7ce7d5778a 100644 --- a/pkg/distro/generic/images.go +++ b/pkg/distro/generic/images.go @@ -333,6 +333,14 @@ func osCustomizations(t *imageType, osPackageSet rpmmd.PackageSet, options distr osc.Files = append(osc.Files, imageConfig.Files...) osc.Directories = append(osc.Directories, imageConfig.Directories...) + if len(containers) > 0 && imageConfig.PodmanDefaultNetBackend != nil { + defaultNetBackendFile, err := container.GenDefaultNetworkBackendFile(*imageConfig.PodmanDefaultNetBackend) + if err != nil { + return osc, fmt.Errorf("generating default network backend file: %w", err) + } + osc.Files = append(osc.Files, defaultNetBackendFile) + } + if imageConfig.NoBLS != nil { osc.NoBLS = *imageConfig.NoBLS } diff --git a/pkg/distro/image_config.go b/pkg/distro/image_config.go index 8b656d6894..33ffe75e54 100644 --- a/pkg/distro/image_config.go +++ b/pkg/distro/image_config.go @@ -5,6 +5,7 @@ import ( "reflect" "github.com/osbuild/images/internal/common" + "github.com/osbuild/images/pkg/container" "github.com/osbuild/images/pkg/customizations/fsnode" "github.com/osbuild/images/pkg/customizations/oci" "github.com/osbuild/images/pkg/customizations/ostreeserver" @@ -153,6 +154,15 @@ type ImageConfig struct { // /usr/lib/ostree-boot into bootupd-compatible update metadata. // Only set this to true if the bootupd package is available in the image. BootupdGenMetadata *bool `yaml:"bootupd_gen_metadata,omitempty"` + + // PodmanDefaultNetBackend sets the default network backend for Podman. + // The value is written to /var/lib/containers/storage/defaultNetworkBackend + // only when the image embeds container images. + // + // Certain versions of Podman fall back to 'cni' when they find existing + // containers in the storage, assuming a migration from an older version. + // This option prevents that behavior. + PodmanDefaultNetBackend *container.NetworkBackend `yaml:"podman_default_net_backend,omitempty"` } // shallowMerge creates a new struct by merging a child and a parent. From 6d65965a796cee772ae9c516eff427594334b7a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 11:58:01 +0100 Subject: [PATCH 5/7] distro/rhel-9: set podman default network backend to netavark MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RHEL 9 Podman falls back to the legacy 'cni' network backend when it finds pre-existing container images in storage, but the 'cni' packages are not installed by default. Force 'netavark' so that images with embedded containers work out of the box. This only affects RHEL 9 / CentOS Stream 9; newer distros (and newer podman versions) don't have this fallback logic. Regenerate test manifests. All el9 / c9s manifests that embed containers now get the podman default network backend set. Signed-off-by: Tomáš Hozza --- data/distrodefs/rhel-9/imagetypes.yaml | 1 + .../centos_9-aarch64-edge_commit-embed_containers | 2 +- .../centos_9-aarch64-edge_container-embed_containers_2 | 2 +- .../centos_9-x86_64-edge_commit-embed_containers | 2 +- .../centos_9-x86_64-edge_container-embed_containers_2 | 2 +- .../rhel_9.0-aarch64-edge_commit-embed_containers | 2 +- .../rhel_9.0-aarch64-edge_container-embed_containers_2 | 2 +- .../rhel_9.0-x86_64-edge_commit-embed_containers | 2 +- .../rhel_9.0-x86_64-edge_container-embed_containers_2 | 2 +- .../rhel_9.2-aarch64-edge_commit-embed_containers | 2 +- .../rhel_9.2-aarch64-edge_container-embed_containers_2 | 2 +- .../rhel_9.2-x86_64-edge_commit-embed_containers | 2 +- .../rhel_9.2-x86_64-edge_container-embed_containers_2 | 2 +- .../rhel_9.4-aarch64-edge_commit-embed_containers | 2 +- .../rhel_9.4-aarch64-edge_container-embed_containers_2 | 2 +- .../rhel_9.4-x86_64-edge_commit-embed_containers | 2 +- .../rhel_9.4-x86_64-edge_container-embed_containers_2 | 2 +- .../rhel_9.6-aarch64-edge_commit-embed_containers | 2 +- .../rhel_9.6-aarch64-edge_container-embed_containers_2 | 2 +- .../rhel_9.6-x86_64-edge_commit-embed_containers | 2 +- .../rhel_9.6-x86_64-edge_container-embed_containers_2 | 2 +- .../rhel_9.7-aarch64-edge_commit-embed_containers | 2 +- .../rhel_9.7-aarch64-edge_container-embed_containers_2 | 2 +- .../rhel_9.7-x86_64-edge_commit-embed_containers | 2 +- .../rhel_9.7-x86_64-edge_container-embed_containers_2 | 2 +- .../rhel_9.8-aarch64-edge_commit-embed_containers | 2 +- .../rhel_9.8-aarch64-edge_container-embed_containers_2 | 2 +- .../rhel_9.8-x86_64-edge_commit-embed_containers | 2 +- .../rhel_9.8-x86_64-edge_container-embed_containers_2 | 2 +- 29 files changed, 29 insertions(+), 28 deletions(-) diff --git a/data/distrodefs/rhel-9/imagetypes.yaml b/data/distrodefs/rhel-9/imagetypes.yaml index 3c8ad6886a..4ab187148c 100644 --- a/data/distrodefs/rhel-9/imagetypes.yaml +++ b/data/distrodefs/rhel-9/imagetypes.yaml @@ -1394,6 +1394,7 @@ image_config: default: default_kernel: "kernel" + podman_default_net_backend: "netavark" default_oscap_datastream: "/usr/share/xml/scap/ssg/content/ssg-rhel9-ds.xml" install_weak_deps: true locale: "C.UTF-8" diff --git a/test/data/manifest-checksums/centos_9-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/centos_9-aarch64-edge_commit-embed_containers index 624881a0f8..1eae200650 100644 --- a/test/data/manifest-checksums/centos_9-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/centos_9-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -0b8edf8fd470cd3ab722c47c38370e8b32975b2a +8d25c7a125480d6dd342a7d8408ea489ea77661c diff --git a/test/data/manifest-checksums/centos_9-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/centos_9-aarch64-edge_container-embed_containers_2 index 1657f32b00..6a8926572f 100644 --- a/test/data/manifest-checksums/centos_9-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/centos_9-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -c9f10ed6c24a66184e3ca26daebeeb186af36628 +3fc4651cc170a06333b01eb07be2daeaa3dac3f4 diff --git a/test/data/manifest-checksums/centos_9-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/centos_9-x86_64-edge_commit-embed_containers index 3ef1e1a0c4..1759276a7d 100644 --- a/test/data/manifest-checksums/centos_9-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/centos_9-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -7c5bdfed9967686b46107bd24cc10b36d39d4a3d +bbe192556f7234e33c9ea23a944c9cf1ef656a01 diff --git a/test/data/manifest-checksums/centos_9-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/centos_9-x86_64-edge_container-embed_containers_2 index 14e96fbf97..5ecb1ca9cb 100644 --- a/test/data/manifest-checksums/centos_9-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/centos_9-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -a25d3fc654d02642d52e4b1c9e0ab369de5da040 +841f779010caad0efc968ffd4c5bc593f3b5aa29 diff --git a/test/data/manifest-checksums/rhel_9.0-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.0-aarch64-edge_commit-embed_containers index 44280246e0..0314cc0ec2 100644 --- a/test/data/manifest-checksums/rhel_9.0-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.0-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -ea87fbe67dc24fe2d1c278f2548a40d9906521e2 +79a42fdadda3466ae0d170e0f3316634071aa5f0 diff --git a/test/data/manifest-checksums/rhel_9.0-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.0-aarch64-edge_container-embed_containers_2 index f168e1e262..d7eaadda09 100644 --- a/test/data/manifest-checksums/rhel_9.0-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.0-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -fbcbd674ef3602547e64c807af7087989245854f +5e01ad3469f8f7bd85d3aa41be82d5bc50bfdfc1 diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.0-x86_64-edge_commit-embed_containers index 9cbd35dc69..a4b2cc8374 100644 --- a/test/data/manifest-checksums/rhel_9.0-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.0-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -3460516fe032254fc61406fb76d56af08ba15fc4 +b6f7b7847bd5897a4b6a308bddec6785684795f4 diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.0-x86_64-edge_container-embed_containers_2 index eb4c2ad0a0..b5cb65fa65 100644 --- a/test/data/manifest-checksums/rhel_9.0-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.0-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -8e085d987fe16a45cca8f05145c16f18ca16f735 +0617e32314b02e06a3a53e1eee577dbb91f1343a diff --git a/test/data/manifest-checksums/rhel_9.2-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.2-aarch64-edge_commit-embed_containers index 86b21203af..e8a0f36d08 100644 --- a/test/data/manifest-checksums/rhel_9.2-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.2-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -6d87171dddce9db8ca1aad1b6874912cee7711ee +1c0ee4c7dd0e8b532afcc5efc73489f0e0cc5342 diff --git a/test/data/manifest-checksums/rhel_9.2-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.2-aarch64-edge_container-embed_containers_2 index a20ee24af1..bbca1e73d2 100644 --- a/test/data/manifest-checksums/rhel_9.2-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.2-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -68c617eb6776392093ea405478ce30eb7aacef7c +9eaa533384c1c1819d2c6436f3ea2038afe600a4 diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.2-x86_64-edge_commit-embed_containers index a327c98daf..558dd7c75e 100644 --- a/test/data/manifest-checksums/rhel_9.2-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.2-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -0a9f9a786f1b189d62335b11474a6ae991dbb51b +45ce4521d602abd2c1dbef04f68b7adc84dab061 diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.2-x86_64-edge_container-embed_containers_2 index d865e15817..8984a37e63 100644 --- a/test/data/manifest-checksums/rhel_9.2-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.2-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -03175f63a32a192d7de2748f4cc3be3905a51e47 +58ec4eca119b129f7ffd8fecaac468c2162a268c diff --git a/test/data/manifest-checksums/rhel_9.4-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.4-aarch64-edge_commit-embed_containers index 09d16a5d2c..5562f909f4 100644 --- a/test/data/manifest-checksums/rhel_9.4-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.4-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -94eb0a36b2d572b763a271c15d2de450acefc3b2 +cea09f5c3a4c7bf4d77087f3760367847aca8603 diff --git a/test/data/manifest-checksums/rhel_9.4-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.4-aarch64-edge_container-embed_containers_2 index 946f66ff9e..30023e3e1d 100644 --- a/test/data/manifest-checksums/rhel_9.4-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.4-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -1b7520a244b478d17ae36df04fb8422c7a142006 +d88f8f92ccfbd26c46bd569245e038807e0bfc00 diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.4-x86_64-edge_commit-embed_containers index 2ea70ac08b..b3c4c11716 100644 --- a/test/data/manifest-checksums/rhel_9.4-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.4-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -99bcd2cb2050d072f408b90c92972c11b79b2693 +bab2e83568034e0879d2d3c4f57b9e78be8da6a0 diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.4-x86_64-edge_container-embed_containers_2 index 4643cc8ea8..5294b20a4b 100644 --- a/test/data/manifest-checksums/rhel_9.4-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.4-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -cf408427f10366dc8218c5719ef997e45c0797b9 +1f18f44ff7c8bae36e392badd8e1356bf9ca8e57 diff --git a/test/data/manifest-checksums/rhel_9.6-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.6-aarch64-edge_commit-embed_containers index 8946e2d295..e531432e7f 100644 --- a/test/data/manifest-checksums/rhel_9.6-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.6-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -064999353642ac414049ecada75a84d5570c75ca +739ba6643f9c1b6afcb4981aab6c3949116f570d diff --git a/test/data/manifest-checksums/rhel_9.6-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.6-aarch64-edge_container-embed_containers_2 index ec582280c0..0fc8ff5cc9 100644 --- a/test/data/manifest-checksums/rhel_9.6-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.6-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -adaab627466c5454eff6a634a70ace3a16247558 +08b7e6f763ebaa8e0487b53f77444314154802a3 diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.6-x86_64-edge_commit-embed_containers index bea1892125..322ce8a9da 100644 --- a/test/data/manifest-checksums/rhel_9.6-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.6-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -1d5b7d2f57792be9ebebba6aed09099852176937 +eeb47f58cd054d5e870af0b4413e4e63426cc51b diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.6-x86_64-edge_container-embed_containers_2 index e94a587968..e2fe51112b 100644 --- a/test/data/manifest-checksums/rhel_9.6-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.6-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -c669f5bfe4649e3d91450ae5003175805fa959db +d934d2b5a70fc52aa0a2e35cbf5f3bb48046fb24 diff --git a/test/data/manifest-checksums/rhel_9.7-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.7-aarch64-edge_commit-embed_containers index 50b579df01..ded0bcd41c 100644 --- a/test/data/manifest-checksums/rhel_9.7-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.7-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -f11d44dba6b4c6a351cfe0fa99b53edea5f92384 +4d68bdd1796a287f9777e801b4a7f1a565ecaba9 diff --git a/test/data/manifest-checksums/rhel_9.7-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.7-aarch64-edge_container-embed_containers_2 index 06c60c587f..51e8f76fad 100644 --- a/test/data/manifest-checksums/rhel_9.7-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.7-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -fb86dd4faf4ac538b0bcb806600c8f87fb9e0e68 +3635d5907adbdb0f2f050f26a6f1985e208b766b diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.7-x86_64-edge_commit-embed_containers index 5d0a867b8d..2b085990f2 100644 --- a/test/data/manifest-checksums/rhel_9.7-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.7-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -1669bef10e2ccd4f8b271498be531721a95d6975 +827d587c7059bf9ba5d417b3e6ffaa814ada7499 diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.7-x86_64-edge_container-embed_containers_2 index 5b39c85fb1..cc4af55836 100644 --- a/test/data/manifest-checksums/rhel_9.7-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.7-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -50e0f80258843032c0b6aafb0071fd14c7294852 +7aa1a1410dc493cb57e6a130c5ede8d0b014017b diff --git a/test/data/manifest-checksums/rhel_9.8-aarch64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.8-aarch64-edge_commit-embed_containers index 63b883f738..4a02bbfa3b 100644 --- a/test/data/manifest-checksums/rhel_9.8-aarch64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.8-aarch64-edge_commit-embed_containers @@ -1 +1 @@ -98b6536c798b6570a4a04d1387752ef2b38509f2 +ea575a3d19fba4789e36b616e610d53e5f5ccbdb diff --git a/test/data/manifest-checksums/rhel_9.8-aarch64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.8-aarch64-edge_container-embed_containers_2 index 48c0f8e2b3..38fdd86ed3 100644 --- a/test/data/manifest-checksums/rhel_9.8-aarch64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.8-aarch64-edge_container-embed_containers_2 @@ -1 +1 @@ -b7769e3bbd236494eee158a3c5344767a2c9ca7d +810ac29f1ed34535f05b261c83b987a1c1815764 diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-edge_commit-embed_containers b/test/data/manifest-checksums/rhel_9.8-x86_64-edge_commit-embed_containers index c6b60a1250..35774bce5c 100644 --- a/test/data/manifest-checksums/rhel_9.8-x86_64-edge_commit-embed_containers +++ b/test/data/manifest-checksums/rhel_9.8-x86_64-edge_commit-embed_containers @@ -1 +1 @@ -a470e0966766b19c989dd8aa20e67a048be45466 +78f724b498e2f6593706184216ef3f10c0c53309 diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-edge_container-embed_containers_2 b/test/data/manifest-checksums/rhel_9.8-x86_64-edge_container-embed_containers_2 index e2c760f4cd..91f1554496 100644 --- a/test/data/manifest-checksums/rhel_9.8-x86_64-edge_container-embed_containers_2 +++ b/test/data/manifest-checksums/rhel_9.8-x86_64-edge_container-embed_containers_2 @@ -1 +1 @@ -c38f69b17623b733bebb66678d17918007fab70c +b04f7600f4caee1ff3e1c9b7c76bff69ccf3d7a9 From 1b7efcf74162faadd40479a55b3cd1821830f016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 12:11:55 +0100 Subject: [PATCH 6/7] distro: add tests for PodmanDefaultNetBackend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Verify the podman default network backend behavior at multiple levels: - YAML loading: fake distro YAML with podman_default_net_backend loads correctly into ImageConfig - osCustomizations: the backend file is generated only when both containers are present and the option is set - Real distro cross-check: RHEL 9 has it set to netavark, while Fedora and RHEL 10 leave it unset Also move the backend file generation in osCustomizations() to after the file customizations assignment, which would otherwise overwrite it. Signed-off-by: Tomáš Hozza --- pkg/distro/defs/loader_test.go | 48 +++++++++++++++++++ pkg/distro/generic/fedora_test.go | 16 +++++++ pkg/distro/generic/images_test.go | 78 +++++++++++++++++++++++++++++++ pkg/distro/generic/rhel10_test.go | 16 +++++++ pkg/distro/generic/rhel9_test.go | 17 +++++++ 5 files changed, 175 insertions(+) diff --git a/pkg/distro/defs/loader_test.go b/pkg/distro/defs/loader_test.go index ecc7d72f49..8d4d988e25 100644 --- a/pkg/distro/defs/loader_test.go +++ b/pkg/distro/defs/loader_test.go @@ -14,6 +14,7 @@ import ( "github.com/osbuild/images/internal/common" "github.com/osbuild/images/pkg/arch" + "github.com/osbuild/images/pkg/container" "github.com/osbuild/images/pkg/customizations/oscap" "github.com/osbuild/images/pkg/customizations/users" "github.com/osbuild/images/pkg/datasizes" @@ -655,6 +656,53 @@ image_types: }) } +func TestDefsDistroImageConfigPodmanDefaultNetBackend(t *testing.T) { + netavark := container.NetworkBackendNetavark + + tests := []struct { + name string + yaml string + expected *container.NetworkBackend + }{ + { + name: "podman_default_net_backend is loaded", + yaml: ` +image_config: + default: + podman_default_net_backend: "netavark" + +image_types: + test_type: + filename: foo +`, + expected: &netavark, + }, + { + name: "podman_default_net_backend absent is nil", + yaml: ` +image_config: + default: + locale: "C.UTF-8" + +image_types: + test_type: + filename: foo +`, + expected: nil, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + makeTestImageType(t, tt.yaml) + + dist, err := defs.NewDistroYAML("test-distro-1") + require.NoError(t, err) + assert.Equal(t, tt.expected, dist.ImageConfig().PodmanDefaultNetBackend) + }) + } +} + func TestDefsPartitionTableErrorsNotForImageType(t *testing.T) { badDistroYamlMissingPartitionTable := ` image_types: diff --git a/pkg/distro/generic/fedora_test.go b/pkg/distro/generic/fedora_test.go index 4e437246de..d15e8328e1 100644 --- a/pkg/distro/generic/fedora_test.go +++ b/pkg/distro/generic/fedora_test.go @@ -763,3 +763,19 @@ func TestFedoraDistroBootstrapRef(t *testing.T) { } } } + +func TestFedora_PodmanDefaultNetBackendIsNil(t *testing.T) { + for _, d := range fedoraFamilyDistros { + t.Run(d.Name(), func(t *testing.T) { + a, err := d.GetArch("x86_64") + require.NoError(t, err) + + it, err := a.GetImageType("qcow2") + require.NoError(t, err) + + cfg := it.(*generic.ImageType).GetDefaultImageConfig() + assert.Nil(t, cfg.PodmanDefaultNetBackend, + "Fedora should not set PodmanDefaultNetBackend") + }) + } +} diff --git a/pkg/distro/generic/images_test.go b/pkg/distro/generic/images_test.go index 9bc21490df..31a777095e 100644 --- a/pkg/distro/generic/images_test.go +++ b/pkg/distro/generic/images_test.go @@ -8,8 +8,10 @@ import ( "github.com/osbuild/blueprint/pkg/blueprint" "github.com/osbuild/images/internal/common" + "github.com/osbuild/images/pkg/container" "github.com/osbuild/images/pkg/distro" "github.com/osbuild/images/pkg/distro/defs" + "github.com/osbuild/images/pkg/rpmmd" ) func isoTestImageType() *imageType { @@ -106,3 +108,79 @@ func TestInstallerCustomizationsOverridePreview(t *testing.T) { } } + +func diskTestImageType() *imageType { + return &imageType{ + arch: &architecture{ + distro: &distribution{}, + }, + ImageTypeYAML: defs.ImageTypeYAML{}, + } +} + +func TestOSCustomizationsPodmanDefaultNetBackend(t *testing.T) { + netavark := container.NetworkBackendNetavark + + tests := []struct { + name string + backend *container.NetworkBackend + containers []container.SourceSpec + expectFile bool + expectedVal string + }{ + { + name: "backend set with containers creates file", + backend: &netavark, + containers: []container.SourceSpec{ + {Source: "registry.example.com/test:latest"}, + }, + expectFile: true, + expectedVal: "netavark", + }, + { + name: "nil backend with containers does not create file", + backend: nil, + containers: []container.SourceSpec{ + {Source: "registry.example.com/test:latest"}, + }, + expectFile: false, + }, + { + name: "backend set without containers does not create file", + backend: &netavark, + containers: nil, + expectFile: false, + }, + { + name: "nil backend without containers does not create file", + backend: nil, + containers: nil, + expectFile: false, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + it := diskTestImageType() + it.ImageConfigYAML.ImageConfig = &distro.ImageConfig{ + PodmanDefaultNetBackend: tt.backend, + } + + bp := &blueprint.Blueprint{} + osc, err := osCustomizations(it, rpmmd.PackageSet{}, distro.ImageOptions{}, tt.containers, bp) + require.NoError(t, err) + + const backendPath = "/var/lib/containers/storage/defaultNetworkBackend" + var found bool + for _, f := range osc.Files { + if f.Path() == backendPath { + found = true + assert.Equal(t, []byte(tt.expectedVal), f.Data()) + break + } + } + assert.Equal(t, tt.expectFile, found, + "expected file present=%v at %s", tt.expectFile, backendPath) + }) + } +} diff --git a/pkg/distro/generic/rhel10_test.go b/pkg/distro/generic/rhel10_test.go index 95273ac49a..01c0956687 100644 --- a/pkg/distro/generic/rhel10_test.go +++ b/pkg/distro/generic/rhel10_test.go @@ -399,3 +399,19 @@ func TestRH10Rhel10_KernelOption_NoIfnames(t *testing.T) { } } } + +func TestRhel10_PodmanDefaultNetBackendIsNil(t *testing.T) { + for _, fd := range rhel10FamilyDistros { + t.Run(fd.name, func(t *testing.T) { + a, err := fd.distro.GetArch("x86_64") + require.NoError(t, err) + + it, err := a.GetImageType("qcow2") + require.NoError(t, err) + + cfg := it.(*generic.ImageType).GetDefaultImageConfig() + assert.Nil(t, cfg.PodmanDefaultNetBackend, + "RHEL 10 should not set PodmanDefaultNetBackend") + }) + } +} diff --git a/pkg/distro/generic/rhel9_test.go b/pkg/distro/generic/rhel9_test.go index 292fee835e..7fb707a6b9 100644 --- a/pkg/distro/generic/rhel9_test.go +++ b/pkg/distro/generic/rhel9_test.go @@ -9,6 +9,7 @@ import ( "github.com/osbuild/blueprint/pkg/blueprint" "github.com/osbuild/images/pkg/arch" + "github.com/osbuild/images/pkg/container" "github.com/osbuild/images/pkg/distro" "github.com/osbuild/images/pkg/distro/distro_test_common" "github.com/osbuild/images/pkg/distro/generic" @@ -664,3 +665,19 @@ func TestRhel9_DistroFactory(t *testing.T) { }) } } + +func TestRhel9_PodmanDefaultNetBackendIsSet(t *testing.T) { + d := generic.DistroFactory("rhel-94") + require.NotNil(t, d) + + a, err := d.GetArch("x86_64") + require.NoError(t, err) + + it, err := a.GetImageType("qcow2") + require.NoError(t, err) + + cfg := it.(*generic.ImageType).GetDefaultImageConfig() + require.NotNil(t, cfg.PodmanDefaultNetBackend, + "RHEL 9 should set PodmanDefaultNetBackend to work around the cni fallback") + assert.Equal(t, container.NetworkBackendNetavark, *cfg.PodmanDefaultNetBackend) +} From 219ac1ee2bb01f4d5f556074765480c75ef438d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 10 Mar 2026 12:15:42 +0100 Subject: [PATCH 7/7] test/manifests: embed container in all-customizations config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add podman to the package list and a container reference to the all-customizations test blueprint so that the container embedding and network backend consistency host checks have something to verify. Regenerate manifest checksums to reflect the updated test config and the new defaultNetworkBackend file in RHEL 9 / CentOS Stream 9 manifests. Signed-off-by: Tomáš Hozza --- test/configs/all-customizations.json | 9 +++++++++ .../centos_10-aarch64-ami-all_customizations | 2 +- .../centos_10-x86_64-ami-all_customizations | 2 +- .../centos_9-aarch64-ami-all_customizations | 2 +- .../centos_9-x86_64-ami-all_customizations | 2 +- .../fedora_42-aarch64-generic_ami-all_customizations | 2 +- .../fedora_42-aarch64-generic_qcow2-all_customizations | 2 +- .../fedora_42-aarch64-server_qcow2-all_customizations | 2 +- .../fedora_42-ppc64le-generic_qcow2-all_customizations | 2 +- .../fedora_42-ppc64le-server_qcow2-all_customizations | 2 +- .../fedora_42-s390x-generic_qcow2-all_customizations | 2 +- .../fedora_42-s390x-server_qcow2-all_customizations | 2 +- .../fedora_42-x86_64-generic_ami-all_customizations | 2 +- .../fedora_42-x86_64-generic_qcow2-all_customizations | 2 +- .../fedora_42-x86_64-server_qcow2-all_customizations | 2 +- .../fedora_43-aarch64-generic_ami-all_customizations | 2 +- .../fedora_43-aarch64-generic_qcow2-all_customizations | 2 +- .../fedora_43-aarch64-server_qcow2-all_customizations | 2 +- .../fedora_43-ppc64le-generic_qcow2-all_customizations | 2 +- .../fedora_43-ppc64le-server_qcow2-all_customizations | 2 +- .../fedora_43-s390x-generic_qcow2-all_customizations | 2 +- .../fedora_43-s390x-server_qcow2-all_customizations | 2 +- .../fedora_43-x86_64-generic_ami-all_customizations | 2 +- .../fedora_43-x86_64-generic_qcow2-all_customizations | 2 +- .../fedora_43-x86_64-server_qcow2-all_customizations | 2 +- .../fedora_44-aarch64-generic_ami-all_customizations | 2 +- .../fedora_44-aarch64-generic_qcow2-all_customizations | 2 +- .../fedora_44-aarch64-server_qcow2-all_customizations | 2 +- .../fedora_44-ppc64le-generic_qcow2-all_customizations | 2 +- .../fedora_44-ppc64le-server_qcow2-all_customizations | 2 +- .../fedora_44-s390x-generic_qcow2-all_customizations | 2 +- .../fedora_44-s390x-server_qcow2-all_customizations | 2 +- .../fedora_44-x86_64-generic_ami-all_customizations | 2 +- .../fedora_44-x86_64-generic_qcow2-all_customizations | 2 +- .../fedora_44-x86_64-server_qcow2-all_customizations | 2 +- .../fedora_45-aarch64-generic_ami-all_customizations | 2 +- .../fedora_45-aarch64-generic_qcow2-all_customizations | 2 +- .../fedora_45-aarch64-server_qcow2-all_customizations | 2 +- .../fedora_45-ppc64le-generic_qcow2-all_customizations | 2 +- .../fedora_45-ppc64le-server_qcow2-all_customizations | 2 +- .../fedora_45-s390x-generic_qcow2-all_customizations | 2 +- .../fedora_45-s390x-server_qcow2-all_customizations | 2 +- .../fedora_45-x86_64-generic_ami-all_customizations | 2 +- .../fedora_45-x86_64-generic_qcow2-all_customizations | 2 +- .../fedora_45-x86_64-server_qcow2-all_customizations | 2 +- .../rhel_10.0-aarch64-ami-all_customizations | 2 +- .../rhel_10.0-x86_64-ami-all_customizations | 2 +- .../rhel_10.1-aarch64-ami-all_customizations | 2 +- .../rhel_10.1-x86_64-ami-all_customizations | 2 +- .../rhel_10.2-aarch64-ami-all_customizations | 2 +- .../rhel_10.2-x86_64-ami-all_customizations | 2 +- .../rhel_8.10-aarch64-ami-all_customizations | 2 +- .../rhel_8.10-x86_64-ami-all_customizations | 2 +- .../rhel_8.4-aarch64-ami-all_customizations | 2 +- .../rhel_8.4-x86_64-ami-all_customizations | 2 +- .../rhel_8.6-aarch64-ami-all_customizations | 2 +- .../rhel_8.6-x86_64-ami-all_customizations | 2 +- .../rhel_8.8-aarch64-ami-all_customizations | 2 +- .../rhel_8.8-x86_64-ami-all_customizations | 2 +- .../rhel_9.0-aarch64-ami-all_customizations | 2 +- .../rhel_9.0-x86_64-ami-all_customizations | 2 +- .../rhel_9.2-aarch64-ami-all_customizations | 2 +- .../rhel_9.2-x86_64-ami-all_customizations | 2 +- .../rhel_9.4-aarch64-ami-all_customizations | 2 +- .../rhel_9.4-x86_64-ami-all_customizations | 2 +- .../rhel_9.6-aarch64-ami-all_customizations | 2 +- .../rhel_9.6-x86_64-ami-all_customizations | 2 +- .../rhel_9.7-aarch64-ami-all_customizations | 2 +- .../rhel_9.7-x86_64-ami-all_customizations | 2 +- .../rhel_9.8-aarch64-ami-all_customizations | 2 +- .../rhel_9.8-x86_64-ami-all_customizations | 2 +- 71 files changed, 79 insertions(+), 70 deletions(-) diff --git a/test/configs/all-customizations.json b/test/configs/all-customizations.json index 041d4feb1c..37ce2eb0d2 100644 --- a/test/configs/all-customizations.json +++ b/test/configs/all-customizations.json @@ -12,6 +12,15 @@ { "name": "bluez", "version": "*" + }, + { + "name": "podman", + "version": "*" + } + ], + "containers": [ + { + "source": "registry.access.redhat.com/ubi9/ubi:latest" } ], "modules": [], diff --git a/test/data/manifest-checksums/centos_10-aarch64-ami-all_customizations b/test/data/manifest-checksums/centos_10-aarch64-ami-all_customizations index 257286d90c..4188063574 100644 --- a/test/data/manifest-checksums/centos_10-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/centos_10-aarch64-ami-all_customizations @@ -1 +1 @@ -68d143641e12dd2939d966f7b81edfd3547a25ee +048fe3345d77621058bc80d68ba37c511cdacbdb diff --git a/test/data/manifest-checksums/centos_10-x86_64-ami-all_customizations b/test/data/manifest-checksums/centos_10-x86_64-ami-all_customizations index db29260a1e..51e4139c72 100644 --- a/test/data/manifest-checksums/centos_10-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/centos_10-x86_64-ami-all_customizations @@ -1 +1 @@ -c1af78d4cc07200960bf1fb11fe64d05b17d9fb8 +c64c81b6c99459a3ee0f78562e234e4f1b7791f2 diff --git a/test/data/manifest-checksums/centos_9-aarch64-ami-all_customizations b/test/data/manifest-checksums/centos_9-aarch64-ami-all_customizations index e5f4a24771..bca591dd44 100644 --- a/test/data/manifest-checksums/centos_9-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/centos_9-aarch64-ami-all_customizations @@ -1 +1 @@ -56d6bf46bb7fc12b18851b0ea4d5cb3c31808eb8 +812249dc4eedd8f7c1dfa177e139e8a09d2d5e16 diff --git a/test/data/manifest-checksums/centos_9-x86_64-ami-all_customizations b/test/data/manifest-checksums/centos_9-x86_64-ami-all_customizations index 2dd4f2add9..6c4adfced4 100644 --- a/test/data/manifest-checksums/centos_9-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/centos_9-x86_64-ami-all_customizations @@ -1 +1 @@ -54cc8a2c08b697436c74c8b517475b5e11f5d51a +f16916baf81b8e9f0f3f4a5231c29504a582fc9c diff --git a/test/data/manifest-checksums/fedora_42-aarch64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_42-aarch64-generic_ami-all_customizations index 2673e1dbda..49b3f4a0cd 100644 --- a/test/data/manifest-checksums/fedora_42-aarch64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_42-aarch64-generic_ami-all_customizations @@ -1 +1 @@ -5a8f7ab78bd0ee425206c6776b9cfb64674ffa98 +88acfc2e8eb1eca67ab66367c77e12c06eddeb79 diff --git a/test/data/manifest-checksums/fedora_42-aarch64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-aarch64-generic_qcow2-all_customizations index e57b62e0a1..04dd8a40f0 100644 --- a/test/data/manifest-checksums/fedora_42-aarch64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-aarch64-generic_qcow2-all_customizations @@ -1 +1 @@ -4813beae97dbffe6f611c170a730a4aa770969da +dbb43e51c36694ca591627a62122c296cb3ae3a2 diff --git a/test/data/manifest-checksums/fedora_42-aarch64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-aarch64-server_qcow2-all_customizations index dfd5d302db..7df1ba8b45 100644 --- a/test/data/manifest-checksums/fedora_42-aarch64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-aarch64-server_qcow2-all_customizations @@ -1 +1 @@ -41071c19ad7b7dce4239d85953d5c6424fc0622f +8251108b393f4532a5db8daf2af7bc40859f06a0 diff --git a/test/data/manifest-checksums/fedora_42-ppc64le-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-ppc64le-generic_qcow2-all_customizations index 321c944589..eef346bdfd 100644 --- a/test/data/manifest-checksums/fedora_42-ppc64le-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-ppc64le-generic_qcow2-all_customizations @@ -1 +1 @@ -06301b5b60d3ca4301a60afb5c718ead95011891 +34dafd3d991b3ff7378bee86d1e238ce7589f9dd diff --git a/test/data/manifest-checksums/fedora_42-ppc64le-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-ppc64le-server_qcow2-all_customizations index c8231fce3b..e3b559a29d 100644 --- a/test/data/manifest-checksums/fedora_42-ppc64le-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-ppc64le-server_qcow2-all_customizations @@ -1 +1 @@ -43d167eddb02d9a7ea2a240f6e0a6959d7184040 +87e7feb9bebf7891102d68ac65bb49346c7b9c3a diff --git a/test/data/manifest-checksums/fedora_42-s390x-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-s390x-generic_qcow2-all_customizations index b290eb20e6..c1145b16d4 100644 --- a/test/data/manifest-checksums/fedora_42-s390x-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-s390x-generic_qcow2-all_customizations @@ -1 +1 @@ -3ede2f35ede51ed60144b2374ff30309a0301b1d +42565bdeab88cceebdba3208b36fcb0db643fa2c diff --git a/test/data/manifest-checksums/fedora_42-s390x-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-s390x-server_qcow2-all_customizations index 941beb389b..d5a5aa2ad9 100644 --- a/test/data/manifest-checksums/fedora_42-s390x-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-s390x-server_qcow2-all_customizations @@ -1 +1 @@ -5962fa835d352aaabd6b3b5866abb4808c474b7d +edf7dc94f9101e87ab90237a308cc0724f335a7f diff --git a/test/data/manifest-checksums/fedora_42-x86_64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_42-x86_64-generic_ami-all_customizations index dc20c685cc..86278c9894 100644 --- a/test/data/manifest-checksums/fedora_42-x86_64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_42-x86_64-generic_ami-all_customizations @@ -1 +1 @@ -b24d97185b37731fd8358bf1bae9d294b196165a +c9edf790d965d37222d7d9060cccc53de9aed47a diff --git a/test/data/manifest-checksums/fedora_42-x86_64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-x86_64-generic_qcow2-all_customizations index 32a3d31311..ee2b800060 100644 --- a/test/data/manifest-checksums/fedora_42-x86_64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-x86_64-generic_qcow2-all_customizations @@ -1 +1 @@ -3609788f089a69868c3f6060e41b8a66cdb0bf27 +d2a515a1f3744eff2728a948d39125e4ace5eaf9 diff --git a/test/data/manifest-checksums/fedora_42-x86_64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_42-x86_64-server_qcow2-all_customizations index eaec33593a..a2b5bef533 100644 --- a/test/data/manifest-checksums/fedora_42-x86_64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_42-x86_64-server_qcow2-all_customizations @@ -1 +1 @@ -2c3bd2e9b4d0920529194adcb6de43ab7218bdea +e7937b3a37bf093bc4b9de4aa75e89f9fd6ec658 diff --git a/test/data/manifest-checksums/fedora_43-aarch64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_43-aarch64-generic_ami-all_customizations index 3f9d9e3f7a..9172e51fac 100644 --- a/test/data/manifest-checksums/fedora_43-aarch64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_43-aarch64-generic_ami-all_customizations @@ -1 +1 @@ -0182f0e7696f0911121b2bc164daeb38545ba87b +43b4580c62f07ebc2d33c0ce9e4252eae8373628 diff --git a/test/data/manifest-checksums/fedora_43-aarch64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-aarch64-generic_qcow2-all_customizations index 9a563b1577..455bc39bf1 100644 --- a/test/data/manifest-checksums/fedora_43-aarch64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-aarch64-generic_qcow2-all_customizations @@ -1 +1 @@ -8339c831456b86eb629699a0cc127847c34b939b +fcf57901b9b7fb67cb713e4e7842127423fcb4d3 diff --git a/test/data/manifest-checksums/fedora_43-aarch64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-aarch64-server_qcow2-all_customizations index be2c163e35..a0d0ff5568 100644 --- a/test/data/manifest-checksums/fedora_43-aarch64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-aarch64-server_qcow2-all_customizations @@ -1 +1 @@ -9ac11ce15ab7687c6d25e57a281ddd45ff4c60c7 +2a60f8da44a9de4edaa83fef7201ed3d7bc142d0 diff --git a/test/data/manifest-checksums/fedora_43-ppc64le-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-ppc64le-generic_qcow2-all_customizations index e00c3e9621..1ba8812fb9 100644 --- a/test/data/manifest-checksums/fedora_43-ppc64le-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-ppc64le-generic_qcow2-all_customizations @@ -1 +1 @@ -6c63f2bc2739935e054f14d7000d65edbd99b5fb +488c263c73567c085d76041181897c48b187b986 diff --git a/test/data/manifest-checksums/fedora_43-ppc64le-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-ppc64le-server_qcow2-all_customizations index c94e11e8df..c21b242177 100644 --- a/test/data/manifest-checksums/fedora_43-ppc64le-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-ppc64le-server_qcow2-all_customizations @@ -1 +1 @@ -d18d93f27de239fd14846c1fe28b349a058f295b +24f7a3468146ad9541af76da65978516dfa4c599 diff --git a/test/data/manifest-checksums/fedora_43-s390x-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-s390x-generic_qcow2-all_customizations index 81f364fd46..e83aaa8b4f 100644 --- a/test/data/manifest-checksums/fedora_43-s390x-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-s390x-generic_qcow2-all_customizations @@ -1 +1 @@ -f65968c696709f04df71e874390c93390161b895 +fafefff910152a9e4bd3ef39fba6e13d3d908db2 diff --git a/test/data/manifest-checksums/fedora_43-s390x-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-s390x-server_qcow2-all_customizations index 48a80afd3a..c83355da83 100644 --- a/test/data/manifest-checksums/fedora_43-s390x-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-s390x-server_qcow2-all_customizations @@ -1 +1 @@ -f15c6e7a92e502a9b4dec32a8555c357f74b1800 +6003fd4d6125b2b2bea20715d0329549e8f6f447 diff --git a/test/data/manifest-checksums/fedora_43-x86_64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_43-x86_64-generic_ami-all_customizations index 42acbcd78e..0c2d34817d 100644 --- a/test/data/manifest-checksums/fedora_43-x86_64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_43-x86_64-generic_ami-all_customizations @@ -1 +1 @@ -50575d43714141a14604e40b60560f14ff673e8d +c0ec4c5a8238c82eef3d10aed4b56c25efb62438 diff --git a/test/data/manifest-checksums/fedora_43-x86_64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-x86_64-generic_qcow2-all_customizations index d3210893be..839cd709bf 100644 --- a/test/data/manifest-checksums/fedora_43-x86_64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-x86_64-generic_qcow2-all_customizations @@ -1 +1 @@ -714cd6701531f62ac456469da49c928916bab6c4 +e39a4376174ecce9c1a8dd9dea2e83c1f91e85e9 diff --git a/test/data/manifest-checksums/fedora_43-x86_64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_43-x86_64-server_qcow2-all_customizations index b951b06a04..3973671d96 100644 --- a/test/data/manifest-checksums/fedora_43-x86_64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_43-x86_64-server_qcow2-all_customizations @@ -1 +1 @@ -2cb27eb72ff794c92559fe34b6bcfde8fa87c90c +eba20655272b783f229ca771c51fee83bed99272 diff --git a/test/data/manifest-checksums/fedora_44-aarch64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_44-aarch64-generic_ami-all_customizations index bbc72b7511..69a3139da8 100644 --- a/test/data/manifest-checksums/fedora_44-aarch64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_44-aarch64-generic_ami-all_customizations @@ -1 +1 @@ -e493ccdbc7925f5f5a7b09339b8d6ff368c51af2 +5432e8613384b2ade5cfe75b9aff8e3257650f71 diff --git a/test/data/manifest-checksums/fedora_44-aarch64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-aarch64-generic_qcow2-all_customizations index 0ecaed8835..0ba8cabc5b 100644 --- a/test/data/manifest-checksums/fedora_44-aarch64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-aarch64-generic_qcow2-all_customizations @@ -1 +1 @@ -890d83172a292706f90404918fbb8861f89e34ce +c7c01441f4bdd458472f8865ed7aed1482303db2 diff --git a/test/data/manifest-checksums/fedora_44-aarch64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-aarch64-server_qcow2-all_customizations index 638f677e14..8259af04b5 100644 --- a/test/data/manifest-checksums/fedora_44-aarch64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-aarch64-server_qcow2-all_customizations @@ -1 +1 @@ -85464ab31c1e2c3a989a4406a351f4e7be9b8bd8 +c3a99ec28bebf5dcafe8ca428d4df9a0b2716596 diff --git a/test/data/manifest-checksums/fedora_44-ppc64le-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-ppc64le-generic_qcow2-all_customizations index 1031bb676d..ca8471b7fe 100644 --- a/test/data/manifest-checksums/fedora_44-ppc64le-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-ppc64le-generic_qcow2-all_customizations @@ -1 +1 @@ -b2a6dfd4b41e26c5a926aaec754650d135ff5a29 +96f5a411734f1d9ab751445506b685caa383d0cb diff --git a/test/data/manifest-checksums/fedora_44-ppc64le-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-ppc64le-server_qcow2-all_customizations index 548a842e0f..7715ff97be 100644 --- a/test/data/manifest-checksums/fedora_44-ppc64le-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-ppc64le-server_qcow2-all_customizations @@ -1 +1 @@ -df76ce592dc4664742ccffdd5cb7567f2464e761 +697db8580e2017f627f1c19e77e34643349b56a8 diff --git a/test/data/manifest-checksums/fedora_44-s390x-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-s390x-generic_qcow2-all_customizations index 2accb0baca..859f1d0380 100644 --- a/test/data/manifest-checksums/fedora_44-s390x-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-s390x-generic_qcow2-all_customizations @@ -1 +1 @@ -3a7458986384113ca8b2ba2236c98ce568ca98a6 +c572342a83efdf88ae61aefa9e2911b183c67d55 diff --git a/test/data/manifest-checksums/fedora_44-s390x-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-s390x-server_qcow2-all_customizations index 0737ebeb02..8ce6e331e7 100644 --- a/test/data/manifest-checksums/fedora_44-s390x-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-s390x-server_qcow2-all_customizations @@ -1 +1 @@ -9ce5a47053d14858244913b7a455e2a0f39b7bc1 +3fc84b006d0c8f2c5fce311e5fe8cfe036b88972 diff --git a/test/data/manifest-checksums/fedora_44-x86_64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_44-x86_64-generic_ami-all_customizations index 2679caeba7..fcff9e0866 100644 --- a/test/data/manifest-checksums/fedora_44-x86_64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_44-x86_64-generic_ami-all_customizations @@ -1 +1 @@ -524d6a03cd898f5aa9c71348a22ea09c9080790e +6c6f78d8538809158f4adfa00ab2ef0993f714d1 diff --git a/test/data/manifest-checksums/fedora_44-x86_64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-x86_64-generic_qcow2-all_customizations index f3001fa6c6..ef2a536431 100644 --- a/test/data/manifest-checksums/fedora_44-x86_64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-x86_64-generic_qcow2-all_customizations @@ -1 +1 @@ -1e9821823e9038a0643ff786b4c286bf29f6a9cd +8be4bb0664162771f7f7333477e969af8c6cf56f diff --git a/test/data/manifest-checksums/fedora_44-x86_64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_44-x86_64-server_qcow2-all_customizations index 79413527c5..2f80931758 100644 --- a/test/data/manifest-checksums/fedora_44-x86_64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_44-x86_64-server_qcow2-all_customizations @@ -1 +1 @@ -054c636bac8527e67f57d6f869c81a4002d36bcb +4ef4cef739b32a9c410412df1ef7d6ea54be074c diff --git a/test/data/manifest-checksums/fedora_45-aarch64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_45-aarch64-generic_ami-all_customizations index f4b668c27e..e05616e320 100644 --- a/test/data/manifest-checksums/fedora_45-aarch64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_45-aarch64-generic_ami-all_customizations @@ -1 +1 @@ -2f33849cd4ae0fe3ddfe36cb279424157c8e3fc3 +6ff5439248bc1a75b95adca996edd8dd652e0ca6 diff --git a/test/data/manifest-checksums/fedora_45-aarch64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-aarch64-generic_qcow2-all_customizations index 55b3cb951e..f03ae4e2d9 100644 --- a/test/data/manifest-checksums/fedora_45-aarch64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-aarch64-generic_qcow2-all_customizations @@ -1 +1 @@ -0e2b40ad542f6d01b08a32a531eeba5a6f0ce86a +5fb2ceccd7b3482328050fc3b35dc919e3dd26b5 diff --git a/test/data/manifest-checksums/fedora_45-aarch64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-aarch64-server_qcow2-all_customizations index f9a387018e..2ecf61d698 100644 --- a/test/data/manifest-checksums/fedora_45-aarch64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-aarch64-server_qcow2-all_customizations @@ -1 +1 @@ -5f19dccbd625c5cb6ba5e7b8289b63279e3bcb16 +1fdf05963df3d4823b1c1d247ed264974174f4e7 diff --git a/test/data/manifest-checksums/fedora_45-ppc64le-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-ppc64le-generic_qcow2-all_customizations index 5236929235..b8445ea129 100644 --- a/test/data/manifest-checksums/fedora_45-ppc64le-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-ppc64le-generic_qcow2-all_customizations @@ -1 +1 @@ -702cae9e6892b45cb4f7ba271b576ae3a0ede94f +a72df0ee5e01b877e8f31dcc608819151b228d51 diff --git a/test/data/manifest-checksums/fedora_45-ppc64le-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-ppc64le-server_qcow2-all_customizations index 9864b378ef..7c979dd7d8 100644 --- a/test/data/manifest-checksums/fedora_45-ppc64le-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-ppc64le-server_qcow2-all_customizations @@ -1 +1 @@ -23bd6ff7d4a60f88beb6b1772a21d59b711a653e +d450da4bcd44185c73719c82ddf363b230b29715 diff --git a/test/data/manifest-checksums/fedora_45-s390x-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-s390x-generic_qcow2-all_customizations index 6a6e176c51..6f3bac0b64 100644 --- a/test/data/manifest-checksums/fedora_45-s390x-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-s390x-generic_qcow2-all_customizations @@ -1 +1 @@ -ca745e6a2358cd55a5826b489ac55028179f5500 +eb68647e32659d352e8c48ffd76cf8f9662ea918 diff --git a/test/data/manifest-checksums/fedora_45-s390x-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-s390x-server_qcow2-all_customizations index d6c3554d41..766c565954 100644 --- a/test/data/manifest-checksums/fedora_45-s390x-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-s390x-server_qcow2-all_customizations @@ -1 +1 @@ -2e1e97e8ec3f84ec62eaec8efe6ee4a77c8bc7b5 +c99b49afe9f8d5b478ececfe9d4dcb85b6faf919 diff --git a/test/data/manifest-checksums/fedora_45-x86_64-generic_ami-all_customizations b/test/data/manifest-checksums/fedora_45-x86_64-generic_ami-all_customizations index f741b5c915..c29c48fd20 100644 --- a/test/data/manifest-checksums/fedora_45-x86_64-generic_ami-all_customizations +++ b/test/data/manifest-checksums/fedora_45-x86_64-generic_ami-all_customizations @@ -1 +1 @@ -c9e28ba0a57b73b7e639611912f02024bff2abe6 +9f321e58e62db0d8af5fa3a379d4c5ab680ac1b3 diff --git a/test/data/manifest-checksums/fedora_45-x86_64-generic_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-x86_64-generic_qcow2-all_customizations index d5f0611da3..32548dba9b 100644 --- a/test/data/manifest-checksums/fedora_45-x86_64-generic_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-x86_64-generic_qcow2-all_customizations @@ -1 +1 @@ -85dc313935cd3be8cdeeb3f9089016bb8d7ad409 +97fdd1b70df4696aeba3744367a0739cde0becb5 diff --git a/test/data/manifest-checksums/fedora_45-x86_64-server_qcow2-all_customizations b/test/data/manifest-checksums/fedora_45-x86_64-server_qcow2-all_customizations index 402ae6ad09..56f12fcede 100644 --- a/test/data/manifest-checksums/fedora_45-x86_64-server_qcow2-all_customizations +++ b/test/data/manifest-checksums/fedora_45-x86_64-server_qcow2-all_customizations @@ -1 +1 @@ -95ae0111505055da8f9131c81f4c588ac6438fd7 +8714fc178f760f58b9160f344487f58048da062d diff --git a/test/data/manifest-checksums/rhel_10.0-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_10.0-aarch64-ami-all_customizations index d976d93bf4..6eb98c297c 100644 --- a/test/data/manifest-checksums/rhel_10.0-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_10.0-aarch64-ami-all_customizations @@ -1 +1 @@ -dc2a57c775af7844e816fa296ab8315f7077f7b1 +acee978b6df6bfd6915d74c1c9d4524629380b07 diff --git a/test/data/manifest-checksums/rhel_10.0-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_10.0-x86_64-ami-all_customizations index 217d99e533..c8859a09c4 100644 --- a/test/data/manifest-checksums/rhel_10.0-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_10.0-x86_64-ami-all_customizations @@ -1 +1 @@ -b41ab3979e9c06b95536e8084b566c611436d696 +37ff2f404e3311c659038546013cfc96c34b52b4 diff --git a/test/data/manifest-checksums/rhel_10.1-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_10.1-aarch64-ami-all_customizations index a3e2ab0067..6a65746719 100644 --- a/test/data/manifest-checksums/rhel_10.1-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_10.1-aarch64-ami-all_customizations @@ -1 +1 @@ -d445bd94699827e5a1464cc5b516c31fee4208fb +53f785693e860e3011e82b5f10a46b95d90d03c1 diff --git a/test/data/manifest-checksums/rhel_10.1-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_10.1-x86_64-ami-all_customizations index 2ab294450d..d6c511e8bd 100644 --- a/test/data/manifest-checksums/rhel_10.1-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_10.1-x86_64-ami-all_customizations @@ -1 +1 @@ -1623501997d724a50f9958e4e19142e8a61e04bc +03278c8e647252d68a572519b9f523afddfa932b diff --git a/test/data/manifest-checksums/rhel_10.2-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_10.2-aarch64-ami-all_customizations index 323fbb6c2f..0f2390dbb6 100644 --- a/test/data/manifest-checksums/rhel_10.2-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_10.2-aarch64-ami-all_customizations @@ -1 +1 @@ -76b17a8dee2580fb02e634c0eb669d911028092c +2d3afa0cb9f967105b2c82f93269d9c45ed52a3a diff --git a/test/data/manifest-checksums/rhel_10.2-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_10.2-x86_64-ami-all_customizations index 3a38f7e858..3c3432cbe6 100644 --- a/test/data/manifest-checksums/rhel_10.2-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_10.2-x86_64-ami-all_customizations @@ -1 +1 @@ -23d91afce641249ce4c4722da33f76b0276d1a10 +cc7ce17a66dbaeff028f00d9dd075a317ad85ed3 diff --git a/test/data/manifest-checksums/rhel_8.10-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.10-aarch64-ami-all_customizations index a9d5155cbf..abf2a93e58 100644 --- a/test/data/manifest-checksums/rhel_8.10-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.10-aarch64-ami-all_customizations @@ -1 +1 @@ -599821455710dacd4d5d116968cdaacd9f850106 +d08eef50b26c921bdd89e0025f6f0ca0fe8d10a5 diff --git a/test/data/manifest-checksums/rhel_8.10-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.10-x86_64-ami-all_customizations index 3c22779cd2..076a407797 100644 --- a/test/data/manifest-checksums/rhel_8.10-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.10-x86_64-ami-all_customizations @@ -1 +1 @@ -e2929915f16d9d0e98aab5539a6c6fda37e136ac +387200c72ddb9be2c323b699ad0f1221afbb12de diff --git a/test/data/manifest-checksums/rhel_8.4-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.4-aarch64-ami-all_customizations index 9afea3efd5..50d6d9ec91 100644 --- a/test/data/manifest-checksums/rhel_8.4-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.4-aarch64-ami-all_customizations @@ -1 +1 @@ -185ec44d36aff1eb38e53088889a9f1c7451e596 +cf554abf1cffd32377eed2f0d0085e5bb3ac528f diff --git a/test/data/manifest-checksums/rhel_8.4-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.4-x86_64-ami-all_customizations index a9cdb64288..59fdd684ad 100644 --- a/test/data/manifest-checksums/rhel_8.4-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.4-x86_64-ami-all_customizations @@ -1 +1 @@ -06075b6d9397ae8a3378d2d7f7a3b044bb73a641 +76f0a732e6f2595c7cadf0f1ca721748008aecf0 diff --git a/test/data/manifest-checksums/rhel_8.6-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.6-aarch64-ami-all_customizations index ad1a7a4e8c..412cdcef3c 100644 --- a/test/data/manifest-checksums/rhel_8.6-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.6-aarch64-ami-all_customizations @@ -1 +1 @@ -690f9517dd463f862dc3aeed9815661166b87f19 +fc55e1601e8f9b7717a117dc59d2ecac7abf704f diff --git a/test/data/manifest-checksums/rhel_8.6-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.6-x86_64-ami-all_customizations index c1bb743345..5833a8ea78 100644 --- a/test/data/manifest-checksums/rhel_8.6-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.6-x86_64-ami-all_customizations @@ -1 +1 @@ -94871afe4be41249bee2ddea2215e208a62595ec +c5bdae736596e923c9e56bc756b06094ac4af173 diff --git a/test/data/manifest-checksums/rhel_8.8-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.8-aarch64-ami-all_customizations index 01ae1c8841..98fd796943 100644 --- a/test/data/manifest-checksums/rhel_8.8-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.8-aarch64-ami-all_customizations @@ -1 +1 @@ -f052bc89f46c13d30623bd05ecebd3ab89140626 +6e6c0bb58e23c5ca11149a610b5a867028e054c3 diff --git a/test/data/manifest-checksums/rhel_8.8-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_8.8-x86_64-ami-all_customizations index b9613c861e..95dd51e3ee 100644 --- a/test/data/manifest-checksums/rhel_8.8-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_8.8-x86_64-ami-all_customizations @@ -1 +1 @@ -5c5e547aa8c48a80f91364b114f85468c3abe5b0 +0af24c4458cb9ac9c3413f61a833a10e4b510e1d diff --git a/test/data/manifest-checksums/rhel_9.0-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.0-aarch64-ami-all_customizations index ac9b8ffdc1..7b04705ed0 100644 --- a/test/data/manifest-checksums/rhel_9.0-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.0-aarch64-ami-all_customizations @@ -1 +1 @@ -9c962c64a097af11a88c97d84a1608443c28a636 +66b1ed13511d2186021843428c1e41c26ff691dd diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.0-x86_64-ami-all_customizations index cb3c37517c..fdd9985cd2 100644 --- a/test/data/manifest-checksums/rhel_9.0-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.0-x86_64-ami-all_customizations @@ -1 +1 @@ -04640de51e0ecf2f24e6ee34b2b7ae426505826b +d27e299d0d1389f63297c08571f2b47eaadaf92b diff --git a/test/data/manifest-checksums/rhel_9.2-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.2-aarch64-ami-all_customizations index 898529a5c9..03efbfc3ed 100644 --- a/test/data/manifest-checksums/rhel_9.2-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.2-aarch64-ami-all_customizations @@ -1 +1 @@ -b0974e386a40925df313b722d32cf633f8e5f758 +e668395a7517205731ce6b070b90676fed492d9c diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.2-x86_64-ami-all_customizations index 6a9a32f4e1..fbcac1efcb 100644 --- a/test/data/manifest-checksums/rhel_9.2-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.2-x86_64-ami-all_customizations @@ -1 +1 @@ -17e68962ad2644e317156e6d748c59738cc069dd +13fce34b67627eaaff5dd35bf44ff2fa657adfcd diff --git a/test/data/manifest-checksums/rhel_9.4-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.4-aarch64-ami-all_customizations index 85e03c25b3..1d68ff36ea 100644 --- a/test/data/manifest-checksums/rhel_9.4-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.4-aarch64-ami-all_customizations @@ -1 +1 @@ -ed1ff8483cac827ac249d2faeb95be3059c28406 +4e2ede2e77cc144a7b34fe59b79aad2d4d80cdbc diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.4-x86_64-ami-all_customizations index dfbcaeb03a..b8001fad66 100644 --- a/test/data/manifest-checksums/rhel_9.4-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.4-x86_64-ami-all_customizations @@ -1 +1 @@ -72e18ec73ca7b9a46087b095c1e37be5a1c5f3f4 +1729e89dedcc44ad1c9a5c2e4b6e3db74e475b55 diff --git a/test/data/manifest-checksums/rhel_9.6-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.6-aarch64-ami-all_customizations index 0e72bedad3..324bb56095 100644 --- a/test/data/manifest-checksums/rhel_9.6-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.6-aarch64-ami-all_customizations @@ -1 +1 @@ -bddf10c4296620ff51d155e7fce0b6be75901b13 +8dc88fffe29c0bd710f41d4797737746006df4de diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.6-x86_64-ami-all_customizations index 15e30e9453..630dc5e44b 100644 --- a/test/data/manifest-checksums/rhel_9.6-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.6-x86_64-ami-all_customizations @@ -1 +1 @@ -422c986ea0b71b36d4f62f354cab4528af215e98 +30d7ae4cedd6b20a21d90c00610a1df86b570945 diff --git a/test/data/manifest-checksums/rhel_9.7-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.7-aarch64-ami-all_customizations index 6d13cfd429..e7eb3855ea 100644 --- a/test/data/manifest-checksums/rhel_9.7-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.7-aarch64-ami-all_customizations @@ -1 +1 @@ -a0c13758a968ec701b78a755f18437d0df7b7892 +d743b09040be08786642ffe6060625367d3d6178 diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.7-x86_64-ami-all_customizations index 9d2641d35a..2b523aac40 100644 --- a/test/data/manifest-checksums/rhel_9.7-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.7-x86_64-ami-all_customizations @@ -1 +1 @@ -ac6684d085d41336379cfd91ade61ca2578cf4de +0373a6d7949402797f6817bfb40a60d4454d235f diff --git a/test/data/manifest-checksums/rhel_9.8-aarch64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.8-aarch64-ami-all_customizations index c0e02163ec..7f92cbfd0f 100644 --- a/test/data/manifest-checksums/rhel_9.8-aarch64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.8-aarch64-ami-all_customizations @@ -1 +1 @@ -ea30d491693cdb396bd6528ed71316207ee88290 +1060d111caa5dbbe55317f51da6a47894ab85995 diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-ami-all_customizations b/test/data/manifest-checksums/rhel_9.8-x86_64-ami-all_customizations index a636750f5d..3fbbb6a8e8 100644 --- a/test/data/manifest-checksums/rhel_9.8-x86_64-ami-all_customizations +++ b/test/data/manifest-checksums/rhel_9.8-x86_64-ami-all_customizations @@ -1 +1 @@ -0cfe9903b2379a618ba7063887be173bc8f100ad +579cab52c663c1386363a0858aab239a23e172bc