[RHEL 9.4] disable dracut for ostree based systems on rpm installation (RHEL-63058) #989
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
achilleas-k
changed the title
achilleas-k
force-pushed
the
backport/9.4/ostree-disable-dracut
branch
11 times, most recently
from
0c39a86 to
cda5a59
Compare
supakeen
previously approved these changes
Oct 18, 2024
|
Testing changes still need a bit of work. Gotta trim the dependencies (btrfs etc), add compile flags to make them unneeded, and remove the aws-cli stuff in the gitlab pipelines. It's ok to ignore build result caching for this branch. |
achilleas-k
force-pushed
the
backport/9.4/ostree-disable-dracut
branch
7 times, most recently
from
fc39db8 to
64135d3
Compare
Updating the test configs and test scripts is necessary to be compatible with recent changes in the way we handle testing ostree-based images. Since a58470c (v0.65.0), we stopped using the gitlab registry to host ostree containers. This commit also removes all repository configurations except RHEL 9.4 and regenerates the gitlab test matrix so that we only focus on testing that distribution version. The unit tests on Fedora 40 have been removed. Unit tests will only run on CentOS Stream 9 with an osbuild version matching the version used in v0.40.0. The config-map has been reduced to only include configurations valid for RHEL 9.4. The cmd/boot-aws command is also pulled from main because it will be called with new flags and features from the test scripts in ./test.
Installing the `minimal-environment` RPM group implies the installation of `dracut-config-rescue` which makes `org.osbuild.ostree.preptree` to fail because `rpm-ostree` detects multiple kernels within the tree (the usual one and the rescue one). Disabling dracut during the rpm installation prevents the rescue kernel/initrd to be generated and makes `rpm-ostree` to finish the compose succesfully. `rpm-ostree` runs dracut on his own during the compose so this doesn't seem to affect the final result. Resolves: osbuild#624
The @minimal-environment rpm group includes 'dracut-config-rescue' which, by default, will create a rescue kernel configuration. With ostree-based images, this will fail, since rpm-ostree requires that only one kernel exists in an image. We now disable dracut when installing packages for ostree commits, so this should no longer be a problem. Adding a configuration pair to test that the image builds and boots. The configs include: 1. An edge-container built with the @minimal-environment rpm group, which will pull in the dracut-config-rescue package. This is built for all RHEL 9 versions. 2. An edge-ami built using the new edge container as input. The config includes a user so that the image can be booted in CI.
achilleas-k
force-pushed
the
backport/9.4/ostree-disable-dracut
branch
from
64135d3 to
5f9867f
Compare
- Disable downloading of build cache. - Disable uploading of results to cache. - Add build tags to exclude the btrfs graphdriver for the container dependencies. - Remove awscli2 and btrfs-progs-devel from the install dependencies script (not available on RHEL). - Remove the check-build-coverage step in gitlab-ci. It requires reading the build cache. - Disable ostree derivative builds (images and installers), since they require the aws cli.
achilleas-k
force-pushed
the
backport/9.4/ostree-disable-dracut
branch
from
5f9867f to
73624c1
Compare
|
All green now! |
supakeen
approved these changes
Oct 22, 2024
achilleas-k
added a commit
to achilleas-k/osbuild-composer
that referenced
this pull request
Oct 22, 2024
Merged
4 tasks
ondrejbudai
pushed a commit
to osbuild/osbuild-composer
that referenced
this pull request
Oct 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport of #895 to RHEL 9.4 for https://issues.redhat.com/browse/RHEL-63058.