Skip to content

osbuild/rpm: implement generic env - #2586

Merged
supakeen merged 3 commits into
osbuild:mainfrom
supakeen:rpm-env
Aug 19, 2026
Merged

osbuild/rpm: implement generic env #2586
supakeen merged 3 commits into
osbuild:mainfrom
supakeen:rpm-env

Conversation

@supakeen

@supakeen supakeen commented Aug 11, 2026

Copy link
Copy Markdown
Member

In 1 I landed changes to support setting arbitrary environment variables during RPM stage execution. This implements settings them in the wrapper in image-builder.


Note that I didn't implement the newly added kernel install environment variables; we have no use for them (yet) so I left the struct as is.

@supakeen
supakeen requested a review from a team as a code owner August 11, 2026 04:57
supakeen added a commit to supakeen/image-builder that referenced this pull request Aug 11, 2026
Allow use of the experimental flags to set `image-version` and
`image-id`. We don't have a good idea yet how to pass these values
otherwise and introducing command line flags is too early at this point.

This PR is based on top of [1].

[1]: osbuild#2586

Signed-off-by: Simon de Vlieger <[email protected]>
supakeen added a commit to supakeen/image-builder that referenced this pull request Aug 11, 2026
Allow use of the experimental flags to set `image-version` and
`image-id`. We don't have a good idea yet how to pass these values
otherwise and introducing command line flags is too early at this point.

This PR is based on top of [1].

[1]: osbuild#2586

Signed-off-by: Simon de Vlieger <[email protected]>
achilleas-k
achilleas-k previously approved these changes Aug 12, 2026
avitova
avitova previously approved these changes Aug 12, 2026

@avitova avitova left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, failures do ont seem to be related, but let's see after the rerun

}

// Verify deep copy of GenericEnv map
if len(clone.GenericEnv) > 0 {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe this condition is not needed, and if the len was 0, ranging over it would not do any iterations, right?

supakeen and others added 3 commits August 18, 2026 18:53
Bump the minimum osbuild version and the commit used for CI to be able
to use the new stage options for the RPM stage.

Signed-off-by: Simon de Vlieger <[email protected]>
In [1] I landed changes to support setting arbitrary environment
variables during RPM stage execution. This implements settings them in
the wrapper in `image-builder`.

[1]: osbuild/osbuild#2524

Signed-off-by: Simon de Vlieger <[email protected]>
Update CS9 snapshots to get newer selinux policy, required for osbuild
190.
@supakeen
supakeen merged commit 1465ca4 into osbuild:main Aug 19, 2026
54 of 55 checks passed
supakeen added a commit to supakeen/image-builder that referenced this pull request Aug 19, 2026
Allow use of the experimental flags to set `image-version` and
`image-id`. We don't have a good idea yet how to pass these values
otherwise and introducing command line flags is too early at this point.

This PR is based on top of [1].

[1]: osbuild#2586

Signed-off-by: Simon de Vlieger <[email protected]>
supakeen added a commit to supakeen/image-builder that referenced this pull request Aug 20, 2026
Allow use of the experimental flags to set `image-version` and
`image-id`. We don't have a good idea yet how to pass these values
otherwise and introducing command line flags is too early at this point.

This PR is based on top of [1].

[1]: osbuild#2586

Signed-off-by: Simon de Vlieger <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants