[RHEL-9] Drop RHSM and RHUI-specific config from Azure and EC2 images (COMPOSER-2308) #857
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
|
Converting to draft until the RHSM configuration is actually moved to the compose configuration. |
|
Here is a manifest diff summary: And here is a full diff: |
thozza
force-pushed
the
auto-reg-v2-changes
branch
from
664fef0 to
1babbc2
Compare
thozza
force-pushed
the
auto-reg-v2-changes
branch
from
1babbc2 to
44b5c55
Compare
|
I've submitted last compose config changes via https://issues.redhat.com/browse/COMPOSER-2344. Once those are merged, I'll mark this PR as ready. |
thozza
force-pushed
the
auto-reg-v2-changes
branch
from
44b5c55 to
d295a81
Compare
thozza
force-pushed
the
auto-reg-v2-changes
branch
from
d295a81 to
5ee01a1
Compare
|
RHEL / CS pungi configurations have been updated (https://issues.redhat.com/browse/COMPOSER-2344). This PR can be now reviewed. |
Remove the RHUI client RPMs from the image base package set. These will be specified in the Pungi compose configuration as a customization. Related to: https://issues.redhat.com/browse/COMPOSER-2310 Signed-off-by: Tomáš Hozza <[email protected]>
Remove the RHUI client and the redhat-cloud-client-configuration RPMs from the image base package set. These will be specified in the Pungi compose configuration as a customization. Related to: https://issues.redhat.com/browse/COMPOSER-2310 Signed-off-by: Tomáš Hozza <[email protected]>
Remove the RHUI variant of the GCE image. It was never used and exposed to end users. Given the convergence of RHUI images to the common image definitions and the existing customizations, one can customize the plain GCE image to make it RHUI-like. Signed-off-by: Tomáš Hozza <[email protected]>
The RHSM configuration specific to RHUI images was moved to the release configuration, therefore it is no longer needed. Let's simplify functions for constructing image definitions. Related to: https://issues.redhat.com/browse/COMPOSER-2310 Signed-off-by: Tomáš Hozza <[email protected]>
The AMI and RHEL EC2 image had a different package set for no good reason. Let's unify them to reduce the complexity. Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
This is a leftover from the old times, when the required packages were not added automatically to the image build pkg set based on used customizations. Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
Signed-off-by: Tomáš Hozza <[email protected]>
Remove the RHUI-specific parts of image type configurations from the image definition, since these are now specified in the compose configuration. Signed-off-by: Tomáš Hozza <[email protected]>
The previously named "RHUI" image types do not include any RHUI-specific configuration. These images are still build only internally for RHEL. Let's rename them to "internal". The actual image type names is still kept untouched for backward compatibility. Signed-off-by: Tomáš Hozza <[email protected]>
thozza
force-pushed
the
auto-reg-v2-changes
branch
from
5ee01a1 to
4dacffd
Compare
thozza
requested review from
ondrejbudai,
achilleas-k,
mvo5,
schuellerf,
kingsleyzissou and
supakeen
|
osbuild-composer failed tests are expected, since the current In addition, the Unit tests failure on F41 is caused by the Fedora repository checksum mismatch 🤷♂️ |
kingsleyzissou
approved these changes
Sep 17, 2024
achilleas-k
added a commit
to achilleas-k/osbuild-composer
that referenced
this pull request
Sep 17, 2024
Update osbuild/images to include: - blueprint: remove the sshkey customization (osbuild/images#928). - [RHEL-9] Drop RHSM and RHUI-specific config from Azure and EC2 images (COMPOSER-2308) (osbuild/images#857).
achilleas-k
added a commit
to achilleas-k/osbuild-composer
that referenced
this pull request
Sep 17, 2024
gce-rhui is now gone from RHEL 9 [1] and the old name simply aliases to gce. gcp-rhui in the cloudapi now resolves to 'gce' in RHEL 9 and 'gce-rhui' in RHEL 8. [1] osbuild/images#857
thozza
pushed a commit
to osbuild/osbuild-composer
that referenced
this pull request
Sep 17, 2024
Update osbuild/images to include: - blueprint: remove the sshkey customization (osbuild/images#928). - [RHEL-9] Drop RHSM and RHUI-specific config from Azure and EC2 images (COMPOSER-2308) (osbuild/images#857).
thozza
pushed a commit
to osbuild/osbuild-composer
that referenced
this pull request
Sep 17, 2024
gce-rhui is now gone from RHEL 9 [1] and the old name simply aliases to gce. gcp-rhui in the cloudapi now resolves to 'gce' in RHEL 9 and 'gce-rhui' in RHEL 8. [1] osbuild/images#857
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.
Drop the RHSM configuration from RHEL-9 Azure and EC2 image definitions, since it will be applies as a customization in the release configuration.
Additionally, unify the RHUI and non-RHUI image types as much as possible. Internally rename the original "RHUI" image types and functions to "internal", since they no longer have any RHUI-specific bits. However, these are still built only internally in Brew. We actually can't completely drop the RHUI image types, because these are built as compressed files in Brew. We could modify the implementation, but maybe let's just wait for OTK.
Lastly, drop the GCE RHUI image, which was never used and it is not built anywhere (only in osbuild-composer CI, but that can be fixed), even internally. The image could be built by customizing the GCE image type.