iso_bootloaders: Set MenuTimeout from InstallerCustomizations

Also adds tests.

Related: HMS-10627

Author: brlane-rht

pkg/image/iso_bootloaders.go

@@ -37,6 +37,7 @@ func (img *ISOBootloaders) Bootloaders(buildPipeline manifest.Build, platform pl
 		grub2.ISOLabel = img.ISOCustomizations.Label
 		grub2.KernelOpts = kernelOpts
 		grub2.DefaultMenu = img.InstallerCustomizations.DefaultMenu
+		grub2.MenuTimeout = img.InstallerCustomizations.MenuTimeout
 
 		for _, entry := range img.Custom {
 			grub2.Custom = append(grub2.Custom, manifest.ISOGrub2MenuEntry{
@@ -55,6 +56,7 @@ func (img *ISOBootloaders) Bootloaders(buildPipeline manifest.Build, platform pl
 		grub2ppc64.ISOLabel = img.ISOCustomizations.Label
 		grub2ppc64.KernelOpts = kernelOpts
 		grub2ppc64.DefaultMenu = img.InstallerCustomizations.DefaultMenu
+		grub2ppc64.MenuTimeout = img.InstallerCustomizations.MenuTimeout
 
 		for _, entry := range img.Custom {
 			grub2ppc64.Custom = append(grub2ppc64.Custom, manifest.ISOGrub2MenuEntry{
@@ -80,6 +82,9 @@ func (img *ISOBootloaders) Bootloaders(buildPipeline manifest.Build, platform pl
 		efiPipeline.UEFIVendor = platform.GetUEFIVendor()
 		efiPipeline.ISOLabel = img.ISOCustomizations.Label
 		efiPipeline.DefaultMenu = img.InstallerCustomizations.DefaultMenu
+		if img.InstallerCustomizations.MenuTimeout > 0 {
+			efiPipeline.MenuTimeout = &img.InstallerCustomizations.MenuTimeout
+		}
 		efiPipeline.KernelOpts = kernelOpts
 
 		for _, entry := range img.Custom {

pkg/image/iso_bootloaders_test.go

@@ -5,22 +5,19 @@ import (
 	"math/rand"
 	"testing"
 
+	"github.com/osbuild/image-builder/internal/common"
 	"github.com/osbuild/image-builder/pkg/customizations/fsnode"
 	"github.com/osbuild/image-builder/pkg/disk"
 	"github.com/osbuild/image-builder/pkg/image"
 	"github.com/osbuild/image-builder/pkg/manifest"
 	"github.com/osbuild/image-builder/pkg/osbuild"
 	"github.com/osbuild/image-builder/pkg/runner"
+
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestBootType(t *testing.T) {
-	ibl := image.ISOBootloaders{
-		InstallerCustomizations: &manifest.InstallerCustomizations{Product: "Fedora", OSVersion: "44"},
-		ISOCustomizations:       &manifest.ISOCustomizations{Label: "Fedora-44-test"},
-	}
-
 	source := rand.NewSource(int64(0))
 	// math/rand is good enough in this case
 	/* #nosec G404 */
@@ -35,9 +32,11 @@ func TestBootType(t *testing.T) {
 	}
 
 	type testCase struct {
-		bootType manifest.ISOBootType
-		custom   []manifest.ISOGrub2MenuEntry
-		expected []results
+		bootType    manifest.ISOBootType
+		custom      []manifest.ISOGrub2MenuEntry
+		defaultMenu *int
+		menuTimeout *int
+		expected    []results
 	}
 
 	var noCustomMenus []manifest.ISOGrub2MenuEntry
@@ -52,24 +51,38 @@ func TestBootType(t *testing.T) {
 
 	// Check the stages and files for each bootloader type
 	tests := []testCase{
-		testCase{manifest.Grub2UEFIOnlyISOBoot, noCustomMenus, []results{{
-			stages: []string{
-				"org.osbuild.truncate",
-				"org.osbuild.mkfs.fat",
-				"org.osbuild.copy",
-				"org.osbuild.copy"},
-			paths: []string{}},
-		}},
-		testCase{manifest.SyslinuxISOBoot, noCustomMenus, []results{
-			{stages: []string{"org.osbuild.isolinux"}, paths: []string{}}, {
+		testCase{manifest.Grub2UEFIOnlyISOBoot, noCustomMenus, nil, nil,
+			[]results{{
 				stages: []string{
 					"org.osbuild.truncate",
 					"org.osbuild.mkfs.fat",
 					"org.osbuild.copy",
 					"org.osbuild.copy"},
 				paths: []string{}},
+			}},
+		testCase{manifest.SyslinuxISOBoot, noCustomMenus, nil, nil,
+			[]results{
+				{stages: []string{"org.osbuild.isolinux"}, paths: []string{}}, {
+					stages: []string{
+						"org.osbuild.truncate",
+						"org.osbuild.mkfs.fat",
+						"org.osbuild.copy",
+						"org.osbuild.copy"},
+					paths: []string{}},
+			}},
+		testCase{manifest.Grub2ISOBoot, noCustomMenus, nil, nil, []results{{
+			stages: []string{
+				"org.osbuild.grub2.iso.legacy",
+				"org.osbuild.grub2.inst"},
+			paths: []string{}}, {
+			stages: []string{
+				"org.osbuild.truncate",
+				"org.osbuild.mkfs.fat",
+				"org.osbuild.copy",
+				"org.osbuild.copy"},
+			paths: []string{}},
 		}},
-		testCase{manifest.Grub2ISOBoot, noCustomMenus, []results{{
+		testCase{manifest.Grub2ISOBoot, customMenus, nil, nil, []results{{
 			stages: []string{
 				"org.osbuild.grub2.iso.legacy",
 				"org.osbuild.grub2.inst"},
@@ -81,7 +94,7 @@ func TestBootType(t *testing.T) {
 				"org.osbuild.copy"},
 			paths: []string{}},
 		}},
-		testCase{manifest.Grub2ISOBoot, customMenus, []results{{
+		testCase{manifest.Grub2ISOBoot, customMenus, common.ToPtr(1), common.ToPtr(5), []results{{
 			stages: []string{
 				"org.osbuild.grub2.iso.legacy",
 				"org.osbuild.grub2.inst"},
@@ -93,21 +106,29 @@ func TestBootType(t *testing.T) {
 				"org.osbuild.copy"},
 			paths: []string{}},
 		}},
-		testCase{manifest.Grub2PPCISOBoot, noCustomMenus, []results{{
+		testCase{manifest.Grub2PPCISOBoot, noCustomMenus, nil, nil,
+			[]results{{
+				stages: []string{
+					"org.osbuild.grub2.iso.legacy",
+					"org.osbuild.mkdir",
+					"org.osbuild.copy"},
+				paths: []string{"/ppc/bootinfo.txt"}},
+			}},
+		testCase{manifest.Grub2PPCISOBoot, customMenus, nil, nil, []results{{
 			stages: []string{
 				"org.osbuild.grub2.iso.legacy",
 				"org.osbuild.mkdir",
 				"org.osbuild.copy"},
 			paths: []string{"/ppc/bootinfo.txt"}},
 		}},
-		testCase{manifest.Grub2PPCISOBoot, customMenus, []results{{
+		testCase{manifest.Grub2PPCISOBoot, customMenus, common.ToPtr(3), common.ToPtr(15), []results{{
 			stages: []string{
 				"org.osbuild.grub2.iso.legacy",
 				"org.osbuild.mkdir",
 				"org.osbuild.copy"},
 			paths: []string{"/ppc/bootinfo.txt"}},
 		}},
-		testCase{manifest.S390ISOBoot, noCustomMenus, []results{{
+		testCase{manifest.S390ISOBoot, noCustomMenus, nil, nil, []results{{
 			stages: []string{
 				"org.osbuild.copy",
 				"org.osbuild.copy",
@@ -128,8 +149,19 @@ func TestBootType(t *testing.T) {
 	for _, tc := range tests {
 		mf := manifest.New()
 		buildPipeline := image.AddBuildBootstrapPipelines(&mf, runner, nil, nil)
+
+		ibl := image.ISOBootloaders{
+			InstallerCustomizations: &manifest.InstallerCustomizations{Product: "Fedora", OSVersion: "44"},
+			ISOCustomizations:       &manifest.ISOCustomizations{Label: "Fedora-44-test"},
+		}
 		ibl.ISOCustomizations.BootType = tc.bootType
 		ibl.Custom = tc.custom
+		if tc.defaultMenu != nil {
+			ibl.InstallerCustomizations.DefaultMenu = *tc.defaultMenu
+		}
+		if tc.menuTimeout != nil {
+			ibl.InstallerCustomizations.MenuTimeout = *tc.menuTimeout
+		}
 		bootloaders := ibl.Bootloaders(buildPipeline, testPlatform, []string{})
 		require.Len(t, bootloaders, len(tc.expected))
 
@@ -149,6 +181,18 @@ func TestBootType(t *testing.T) {
 			options := grub2Stage.Options.(*osbuild.Grub2ISOLegacyStageOptions)
 			require.NotNil(t, options)
 			checkCustomMenus(t, tc.custom, options.Custom)
+			if tc.defaultMenu != nil {
+				require.NotNil(t, options.Config)
+				assert.Equal(t, *tc.defaultMenu, options.Config.Default)
+			} else {
+				assert.Nil(t, options.Config)
+			}
+			if tc.menuTimeout != nil {
+				require.NotNil(t, options.Config)
+				assert.Equal(t, *tc.menuTimeout, options.Config.Timeout)
+			} else {
+				assert.Nil(t, options.Config)
+			}
 		}
 	}
 }