From 8f196a9dce6629f9c02e15cf227f3dadff45f6f7 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 13 Nov 2024 14:57:28 +0100 Subject: [PATCH] added test for sending grub.cfg.ww Signed-off-by: Christian Goll --- CHANGELOG.md | 1 + internal/pkg/warewulfd/provision_test.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9df8e440..836dcecd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - replaced deprecated errors.Wrapf with fmr.Errorf. #1534 - Rename udev net naming file to 70-persistent-net.rules. #1227 - Manage warewulfd template data as a pointer. #1548 +- Added test for sending grub.cfg.ww. #1548 ### Removed diff --git a/internal/pkg/warewulfd/provision_test.go b/internal/pkg/warewulfd/provision_test.go index cc35f909..c9840950 100644 --- a/internal/pkg/warewulfd/provision_test.go +++ b/internal/pkg/warewulfd/provision_test.go @@ -32,6 +32,7 @@ var provisionSendTests = []struct { {"find grub", "/efiboot/grub.efi", "", 404, "10.10.10.11:9873"}, {"find initramfs", "/provision/00:00:00:ff:ff:ff?stage=initramfs", "", 200, "10.10.10.10:9873"}, {"ipxe test with NetDevs and KernelOverrides", "/provision/00:00:00:00:00:ff?stage=ipxe", "1.1.1 ifname=net:00:00:00:00:00:ff ", 200, "10.10.10.12:9873"}, + {"find grub.cfg", "/efiboot/grub.cfg", "dracut", 200, "10.10.10.11:9873"}, } func Test_ProvisionSend(t *testing.T) { @@ -52,6 +53,8 @@ nodes: default: hwaddr: 00:00:00:00:ff:ff container name: none + tags: + GrubMenuEntry: dracut n3: network devices: default: @@ -97,6 +100,10 @@ nodes: { assert.NoError(t, os.WriteFile(path.Join(conf.Paths.Sysconfdir, "warewulf/ipxe", "test.ipxe"), []byte("{{.KernelOverride}}{{range $devname, $netdev := .NetDevs}}{{if and $netdev.Hwaddr $netdev.Device}} ifname={{$netdev.Device}}:{{$netdev.Hwaddr}} {{end}}{{end}}"), 0600)) } + assert.NoError(t, os.MkdirAll(path.Join(conf.Paths.Sysconfdir, "warewulf/grub"), 0700)) + { + assert.NoError(t, os.WriteFile(path.Join(conf.Paths.Sysconfdir, "warewulf/grub", "grub.cfg.ww"), []byte("{{ .Tags.GrubMenuEntry }}"), 0600)) + } dbErr := LoadNodeDB() assert.NoError(t, dbErr)