Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cloudapi: Add module_hotfixes flag #3831

Merged
merged 3 commits into from
Dec 20, 2023

Conversation

ezr-ondrej
Copy link
Contributor

@ezr-ondrej ezr-ondrej commented Dec 1, 2023

Allow passing module_hotfixes flag through the cloudapi. This will enable depsolving on repositories that might be affected by modularity filtering.

Refs HMS-3202

Needs osbuild/images#284 to have this flag on all the repositories.
⚠️ currently this includes osbuild/images bump, which we want to wait for the release I'm guessing, but apart of that, this is ready for review :)

@thozza
Copy link
Member

thozza commented Dec 7, 2023

You can use images v0.22.0 -> https://github.com/osbuild/images/releases/tag/v0.22.0

@thozza
Copy link
Member

thozza commented Dec 7, 2023

I think that it would be good to enable this repo setting also for user-defined sources (repos) on-premise. This means extending:
https://github.com/osbuild/osbuild-composer/blob/main/internal/store/store.go#L59
https://github.com/osbuild/osbuild-composer/blob/main/internal/store/store.go#L622
https://github.com/osbuild/osbuild-composer/blob/main/internal/weldr/json.go#L138
https://github.com/osbuild/osbuild-composer/blob/main/internal/weldr/json.go#L203

Without this, one won't be able to define 3rd party repos with this option set, which are used for the actual image build. They could only embed repo definitions inside the final image with the option set (this is handled by the BP customization).

@ezr-ondrej ezr-ondrej force-pushed the module_hotfix_composer branch 8 times, most recently from f5968ef to cc2c987 Compare December 12, 2023 14:48
test/cases/api.sh Outdated Show resolved Hide resolved
tools/test-case-generators/repos.json Outdated Show resolved Hide resolved
tools/test-case-generators/repos.json Outdated Show resolved Hide resolved
test/cases/api.sh Outdated Show resolved Hide resolved
test/cases/api.sh Outdated Show resolved Hide resolved
@ezr-ondrej ezr-ondrej force-pushed the module_hotfix_composer branch 6 times, most recently from 6c000c2 to 24a7339 Compare December 13, 2023 13:21
test/cases/api.sh Outdated Show resolved Hide resolved
test/cases/api/aws.sh Show resolved Hide resolved
internal/store/store.go Show resolved Hide resolved
@ezr-ondrej ezr-ondrej force-pushed the module_hotfix_composer branch 3 times, most recently from 7e9ca88 to a5ee2e7 Compare December 14, 2023 20:25
@henrywang
Copy link
Member

All FIPS tests failure has been fixed by PR #3849. Could you please make a rebase? Thanks.

@henrywang
Copy link
Member

All edge-simplified test failure is not caused by this PR. Issue has been fixed by PR #3854

@ezr-ondrej
Copy link
Contributor Author

@thozza can you check out the vsphere failures if you see something in there? https://gitlab.com/redhat/services/products/image-builder/ci/osbuild-composer/-/pipelines/1109228638 I can't figure out what's the issue.
The good news is we seem to be quite close 😛

@ezr-ondrej ezr-ondrej force-pushed the module_hotfix_composer branch 2 times, most recently from b0b2a56 to aa6bc9c Compare December 19, 2023 08:50
Copy link
Member

@thozza thozza left a comment

Choose a reason for hiding this comment

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

LGTM.

The nightly pipeline failures are unrelated to this PR.

internal/store/store.go Show resolved Hide resolved
test/cases/api.sh Show resolved Hide resolved
Allow passing module_hotfixes as repo option,
it will allow disabling of modularity filtering per repository.
Allow passing module_hotfixes flag through the cloudapi.
This will enable depsolving on repositories that might be affected by modularity filtering.

Refs HMS-3202
@thozza thozza enabled auto-merge (rebase) December 20, 2023 07:19
@thozza thozza merged commit d5483cc into osbuild:main Dec 20, 2023
70 of 71 checks passed
@ezr-ondrej ezr-ondrej deleted the module_hotfix_composer branch December 20, 2023 08:37
@ezr-ondrej
Copy link
Contributor Author

Thank you for guiding me @thozza ! 👍

@ondrejbudai ondrejbudai mentioned this pull request Jan 2, 2024
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