Sort combustion scripts before appending them to the combustion scrip…

…t file

pkg/build/build.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"slices"
 	"text/template"
 
 	"github.com/suse-edge/edge-image-builder/pkg/config"
@@ -133,6 +134,9 @@ func (b *Builder) generateCombustionScript() error {
 	}
 
 	// Add a call to each script that was added to the combustion directory
+	// We may need a better way of specifying the order, but for now use alphabetical
+	// so we have at least some determinism
+	slices.Sort(b.combustionScripts)
 	for _, filename := range b.combustionScripts {
 		_, err = fmt.Fprintln(scriptFile, "./"+filename)
 		if err != nil {

pkg/build/build_test.go

@@ -103,12 +103,17 @@ func TestGenerateCombustionScript(t *testing.T) {
 	// Verify
 	require.NoError(t, err)
 
+	// - check the script contents itself
 	scriptBytes, err := os.ReadFile(filepath.Join(builder.combustionDir, "script"))
 	require.NoError(t, err)
 	scriptData := string(scriptBytes)
 	assert.Contains(t, scriptData, "#!/bin/bash")
 	assert.Contains(t, scriptData, "foo.sh")
 	assert.Contains(t, scriptData, "bar.sh")
+
+	// - ensure the order of the scripts is alphabetical
+	assert.Equal(t, "bar.sh", builder.combustionScripts[0])
+	assert.Equal(t, "foo.sh", builder.combustionScripts[1])
 }
 
 func TestWriteCombustionFile(t *testing.T) {