osbuild/rpm: implement generic env

Schutzfile

@@ -6,7 +6,7 @@
         "ref": "quay.io/centos-bootc/bootc-image-builder@sha256:9893e7209e5f449b86ababfd2ee02a58cca2e5990f77b06c3539227531fc8120"
       },
       "osbuild": {
-        "commit": "de5feed41dc25b9a9acd873e59354c338692eb79"
+        "commit": "e25a7f224cae7efbd25a2ceba39385e46d314f59"
       }
     },
     "gitlab-ci-runner": "aws/fedora-44",
@@ -104,4 +104,4 @@
       }
     ]
   }
-}
+}

data/dependencies/deps_test.go

@@ -8,5 +8,5 @@ import (
 )
 
 func TestMinimumOSBuildVersion(t *testing.T) {
-	assert.Equal(t, "189", dependencies.MinimumOSBuildVersion())
+	assert.Equal(t, "190", dependencies.MinimumOSBuildVersion())
 }

data/dependencies/osbuild

@@ -1 +1 @@
-189
+190

pkg/osbuild/rpm_stage.go

@@ -2,6 +2,7 @@ package osbuild
 
 import (
 	"fmt"
+	"maps"
 	"slices"
 
 	"github.com/osbuild/image-builder/internal/common"
@@ -34,6 +35,9 @@ type RPMStageOptions struct {
 	InstallLangs []string `json:"install_langs,omitempty"`
 
 	RPMKeys *RPMKeys `json:"rpmkeys,omitempty"`
+
+	// Set generic environment variables for RPM scriptlets
+	GenericEnv map[string]string `json:"generic_env,omitempty"`
 }
 
 func (o *RPMStageOptions) Clone() *RPMStageOptions {
@@ -51,6 +55,7 @@ func (o *RPMStageOptions) Clone() *RPMStageOptions {
 		KernelInstallEnv: common.ClonePtr(o.KernelInstallEnv),
 		InstallLangs:     slices.Clone(o.InstallLangs),
 		RPMKeys:          common.ClonePtr(o.RPMKeys),
+		GenericEnv:       maps.Clone(o.GenericEnv),
 	}
 }
 

pkg/osbuild/rpm_stage_test.go

@@ -35,6 +35,7 @@ func TestRPMStageOptionsClone(t *testing.T) {
 				OSTreeBooted:     common.ToPtr(true),
 				KernelInstallEnv: &KernelInstallEnv{BootRoot: "/boot"},
 				InstallLangs:     []string{"en_US", "de_DE"},
+				GenericEnv:       map[string]string{"IMAGE_ID": "my-image", "IMAGE_VERSION": "1.0"},
 			},
 		},
 		{
@@ -53,6 +54,12 @@ func TestRPMStageOptionsClone(t *testing.T) {
 				KernelInstallEnv: &KernelInstallEnv{BootRoot: ""},
 			},
 		},
+		{
+			name: "only-generic-env",
+			opts: &RPMStageOptions{
+				GenericEnv: map[string]string{"FOO": "bar", "BAZ": "qux"},
+			},
+		},
 		{
 			name: "empty-slices",
 			opts: &RPMStageOptions{
@@ -103,6 +110,15 @@ func TestRPMStageOptionsClone(t *testing.T) {
 				clone.KernelInstallEnv.BootRoot = "modified"
 				assert.NotEqual(t, tt.opts.KernelInstallEnv.BootRoot, clone.KernelInstallEnv.BootRoot)
 			}
+
+			// Verify deep copy of GenericEnv map
+			if len(clone.GenericEnv) > 0 {
+				for k := range clone.GenericEnv {
+					clone.GenericEnv[k] = "modified"
+					assert.NotEqual(t, tt.opts.GenericEnv[k], clone.GenericEnv[k])
+					break
+				}
+			}
 		})
 	}
 }
@@ -420,6 +436,7 @@ func TestGenRPMStagesFromTransactions(t *testing.T) {
 				Exclude:          &Exclude{Docs: true},
 				KernelInstallEnv: &KernelInstallEnv{BootRoot: "/boot/efi"},
 				InstallLangs:     []string{"cs_CZ", "sk_SK"},
+				GenericEnv:       map[string]string{"IMAGE_ID": "my-image"},
 			},
 			expectStages: 2,
 			validate: func(t *testing.T, stages []*Stage) {
@@ -433,6 +450,7 @@ func TestGenRPMStagesFromTransactions(t *testing.T) {
 					assert.Empty(t, opts.GPGKeys, "stage %d", idx)
 					assert.Equal(t, "/boot/efi", opts.KernelInstallEnv.BootRoot, "stage %d", idx)
 					assert.Equal(t, []string{"cs_CZ", "sk_SK"}, opts.InstallLangs, "stage %d", idx)
+					assert.Equal(t, map[string]string{"IMAGE_ID": "my-image"}, opts.GenericEnv, "stage %d", idx)
 				}
 			},
 		},