bib: add support for ID_LIKE when finding the distro YAML

This commit adds a fallback check when no direct match for
the distro ID from the bootc image is found. As long as
the bootc container sets a correct `ID_LIKE` we should
automatically have the same behavior as before when
we used symlinks as aliases.

If needed we might need to reintroduce an explicit
mapping like:
```go
// mapping of distro IDs that are compatible with
var distroCompat = map[string]string{
	"almalinux":     "rhel",
	"aurora":        "fedora",
	"aurora-helium": "rhel",
	"bazzite":       "fedora",
	"bluefin":       "fedora",
	"heliumos":      "rhel",
	"rocky":         "rhel",
}
```
but lets hope we don't need this.

Note that these tests use the "real" distros.yaml from the images library
so make sure that if rhel-9 goes away the test is updated for rhel-XY
(only the version needs to change)

Author: mvo5

bib/cmd/bootc-image-builder/export_test.go

@@ -5,6 +5,7 @@ var (
 	GetDistroAndRunner = getDistroAndRunner
 	CreateRand         = createRand
 	BuildCobraCmdline  = buildCobraCmdline
+	NewDistroYAMLFrom  = newDistroYAMLFrom
 )
 
 func MockOsGetuid(new func() int) (restore func()) {

bib/cmd/bootc-image-builder/legacy_iso.go

@@ -222,22 +222,37 @@ func labelForISO(os *osinfo.OSRelease, arch *arch.Arch) string {
 	}
 }
 
+// newDistroYAMLFrom() returns the distroYAML for the given sourceInfo,
+// if no direct match can be found it will it will use the ID_LIKE.
+// This should ensure we work on every bootc image that puts a correct
+// ID_LIKE= in /etc/os-release
+func newDistroYAMLFrom(sourceInfo *osinfo.Info) (*defs.DistroYAML, *distro.ID, error) {
+	for _, distroID := range append([]string{sourceInfo.OSRelease.ID}, sourceInfo.OSRelease.IDLike...) {
+		nameVer := fmt.Sprintf("%s-%s", distroID, sourceInfo.OSRelease.VersionID)
+		id, err := distro.ParseID(nameVer)
+		if err != nil {
+			return nil, nil, err
+		}
+		distroYAML, err := defs.NewDistroYAML(nameVer)
+		if err != nil {
+			return nil, nil, err
+		}
+		if distroYAML != nil {
+			return distroYAML, id, nil
+		}
+	}
+	return nil, nil, fmt.Errorf("cannot load distro definitions for %s-%s or any of %v", sourceInfo.OSRelease.ID, sourceInfo.OSRelease.VersionID, sourceInfo.OSRelease.IDLike)
+}
+
 func manifestForISO(c *ManifestConfig, rng *rand.Rand) (*manifest.Manifest, error) {
 	if c.Imgref == "" {
 		return nil, fmt.Errorf("pipeline: no base image defined")
 	}
-
-	nameVer := fmt.Sprintf("%s-%s", c.SourceInfo.OSRelease.ID, c.SourceInfo.OSRelease.VersionID)
-	id, err := distro.ParseID(nameVer)
-	if err != nil {
-		return nil, err
-	}
-	// XXX: ensure all aliases we have for bib are available in
-	// images
-	distroYAML, err := defs.NewDistroYAML(nameVer)
+	distroYAML, id, err := newDistroYAMLFrom(c.SourceInfo)
 	if err != nil {
 		return nil, err
 	}
+
 	// XXX: or "bootc-legacy-installer"?
 	installerImgTypeName := "bootc-rpm-installer"
 	imgType, ok := distroYAML.ImageTypes()[installerImgTypeName]

bib/cmd/bootc-image-builder/legacy_iso_test.go

@@ -0,0 +1,51 @@
+package main_test
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/osbuild/images/pkg/bib/osinfo"
+	"github.com/osbuild/images/pkg/distro"
+
+	main "github.com/osbuild/bootc-image-builder/bib/cmd/bootc-image-builder"
+)
+
+func TestNewDistroYAMLFromError(t *testing.T) {
+	si := &osinfo.Info{
+		OSRelease: osinfo.OSRelease{
+			ID:        "weirdos",
+			VersionID: "2.71",
+			IDLike:    []string{"waffleos", "barky"},
+		},
+	}
+	_, _, err := main.NewDistroYAMLFrom(si)
+	assert.EqualError(t, err, "cannot load distro definitions for weirdos-2.71 or any of [waffleos barky]")
+}
+
+func TestNewDistroYAMLFromDirect(t *testing.T) {
+	si := &osinfo.Info{
+		OSRelease: osinfo.OSRelease{
+			ID:        "centos",
+			VersionID: "10",
+		},
+	}
+	distroYAML, id, err := main.NewDistroYAMLFrom(si)
+	assert.NoError(t, err)
+	assert.Equal(t, &distro.ID{Name: "centos", MajorVersion: 10, MinorVersion: -1}, id)
+	assert.Equal(t, "centos-10", distroYAML.Name)
+}
+
+func TestNewDistroYAMLFromFallback(t *testing.T) {
+	si := &osinfo.Info{
+		OSRelease: osinfo.OSRelease{
+			ID:        "blmblinux",
+			VersionID: "9.6",
+			IDLike:    []string{"non-existing", "rhel", "centos", "fedora"},
+		},
+	}
+	distroYAML, id, err := main.NewDistroYAMLFrom(si)
+	assert.NoError(t, err)
+	assert.Equal(t, &distro.ID{Name: "rhel", MajorVersion: 9, MinorVersion: 6}, id)
+	assert.Equal(t, "rhel-9.6", distroYAML.Name)
+}