Skip to content

rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

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.

Sign up for GitHub

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

Merged
supakeen merged 2 commits into from
Jul 30, 2025
Merged

rhel{9,10}: azure for non-RHEL (HMS-8949) #1707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f437d0b
rhel{9,10}: `azure` image type for non-RHEL
supakeen Jul 29, 2025
5c76609
rhel{9,10}: rm `s-r-b` in non-RHEL
supakeen Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions pkg/distro/defs/distros.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,11 @@ distros:
- ec2
- ec2-sap
- ec2-ha
"some image types are non-rhel-only":
when:
distro_name: "rhel"
ignore_image_types:
- azure
# rhel & centos share the same list of allowed profiles so a
# single allow list can be used
oscap_profiles_allowlist: &oscap_profile_allowlist_rhel
Expand Down Expand Up @@ -187,6 +192,11 @@ distros:
- ec2
- ec2-sap
- ec2-ha
"some image types are non-rhel-only":
when:
distro_name: "rhel"
ignore_image_types:
- azure
"CVM is only available starting from 9.6":
when:
version_less_than: "9.6"
Expand Down
35 changes: 29 additions & 6 deletions pkg/distro/defs/rhel-10/distro.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,7 +945,6 @@ image_types:
- "patch"
- "rng-tools"
- "selinux-policy-targeted"
- "system-reinstall-bootc"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
Expand Down Expand Up @@ -997,15 +996,21 @@ image_types:
- "rhnlib"
- "rhnsd"
- "usb_modeswitch"
conditions: &conditions_pkgsets_insights_client_on_rhel
conditions:
"add insights client on rhel":
when:
distro_name: "rhel"
append:
include:
- "insights-client"
"add system-reinstall-bootc on rhel":
when:
distro_name: "rhel"
append:
include:
- "system-reinstall-bootc"

"azure-rhui": &azure_rhui
"azure": &azure
<<: *vhd
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
Expand Down Expand Up @@ -1103,6 +1108,9 @@ image_types:
- *azure_rhui_part_boot
- *azure_rhui_part_lvm

"azure-rhui": &azure_rhui
<<: *azure

"azure-sap-rhui":
<<: *azure_rhui
platforms:
Expand Down Expand Up @@ -1326,7 +1334,6 @@ image_types:
- "redhat-release"
- "redhat-release-eula"
- "rsync"
- "system-reinstall-bootc"
- "tuned"
- "tar"
exclude:
Expand Down Expand Up @@ -1362,7 +1369,18 @@ image_types:
# RHBZ#2075815
- "qemu-guest-agent"
conditions:
<<: *conditions_pkgsets_insights_client_on_rhel
"add insights client on rhel":
when:
distro_name: "rhel"
append:
include:
- "insights-client"
"add system-reinstall-bootc on rhel":
when:
distro_name: "rhel"
append:
include:
- "system-reinstall-bootc"

# RHEL internal-only x86_64 EC2 image type
ec2: &ec2
Expand Down Expand Up @@ -1882,7 +1900,12 @@ image_types:
# RHBZ#2075815
- "qemu-guest-agent"
conditions:
<<: *conditions_pkgsets_insights_client_on_rhel
"add insights client on rhel":
when:
distro_name: "rhel"
append:
include:
- "insights-client"

"azure-cvm":
<<: *vhd
Expand Down
5 changes: 4 additions & 1 deletion pkg/distro/defs/rhel-9/distro.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1441,7 +1441,7 @@ image_types:
exclude:
- "microcode_ctl"

"azure-rhui": &azure_rhui
"azure": &azure
<<: *vhd
mime_type: "application/xz"
payload_pipelines: ["os", "image", "vpc", "xz"]
Expand Down Expand Up @@ -1597,6 +1597,9 @@ image_types:
- *azure_rhui_part_boot_600
- *azure_rhui_part_lvm

"azure-rhui": &azure_rhui
<<: *azure

"azure-sap-rhui":
<<: *azure_rhui
platforms:
Expand Down
2 changes: 1 addition & 1 deletion pkg/distro/generic/rhel10_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestRhel10_NoBootPartition(t *testing.T) {
if it.ImageTypeYAML.PartitionTables == nil {
continue
}
if it.Name() == "azure-rhui" || it.Name() == "azure-sap-rhui" || it.Name() == "azure-sapapps-rhui" {
if it.Name() == "azure-rhui" || it.Name() == "azure-sap-rhui" || it.Name() == "azure-sapapps-rhui" || it.Name() == "azure" {
// Azure RHEL internal image type PT is by default LVM-based
// and we do not support /boot on LVM, so it must be on a separate partition.
continue
Expand Down
1 change: 1 addition & 0 deletions test/config-map.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
],
"image-types": [
"ami",
"azure",
"azure-cvm",
"azure-eap7-rhui",
"azure-rhui",
Expand Down
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-all_customizations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
993be534314a4e4f3c99c5a7e2d5de88000bded1
c0eadc4e1ef0d8e5b1b07e427da1cc85cfeb6a04
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
32e4441d094952cb970928b8914eb3593ea240e0
2ee3c909a81b8696a4a4f92e2e3fe44591e1be2e
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-file_customizations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
85203a18053ed462c6b4b13dc29191a903a00595
2f0887b19b01346edab151f154cc96388877d17f
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-partitioning_dos_lvm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
922ecc47c2f7f4e51a58968595961c098df4371b
0e882d6a768f0448775c1106e487ec9e524a39fe
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-partitioning_lvm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
29a1b1d961d7fbebac2863974453084705b0bc4f
919685d4a979be5b2eb987ae2627f6a56281da9b
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-ami-partitioning_plain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
41b9d18027f127ece5be59deca86e49bfb311ec1
fcad54a1f5a5b4196644125ebfda7625e6e626fe
1 change: 1 addition & 0 deletions test/data/manifest-checksums/centos_10-aarch64-azure-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ec7c8f9519972286f983506f4c3b6bda8a2ce934
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-aarch64-vhd-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6f3670ca58581fa03db95ac5b38d133d1860dcbc
cdb63a5f44f13a1e3d5dbbc3b336d2eb01b5b65e
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-all_customizations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
74b4b3e5bfd6354f8cedd70f181868fc09620108
236219f1033f80578e5548be7c568d932bf0c42d
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8d98e9c0d4685e5c9410ea80fa5648793fdf3106
4824b53e2edfa90c26d543b35885ab38c71953cb
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-file_customizations
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
f742c3920cb798b57ef9e32ad4981cab2da5813d
48e295f1b099bc5f0a93ff50317e38a1fa9ae6fa
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-partitioning_dos_lvm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
b299ade56b36c2db5da9bd1db02c43f5a1c8000f
4fedacc8a4a8da9b779e34c79d6db3ed0c9e5de6
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-partitioning_lvm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a20e588467b988e110e409278ca3c9489e5090ed
098dab75e46f7e0e41444ba167e923687dab525d
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-ami-partitioning_plain
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3721077f4ed9c3e5555cf2dcb5d78ff1e31c2fd4
2b421ca527df63aeef2839caf82809d8e4950b5e
1 change: 1 addition & 0 deletions test/data/manifest-checksums/centos_10-x86_64-azure-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7f384877bc57ae32c15f109bc290ef4b6efb3f20
2 changes: 1 addition & 1 deletion test/data/manifest-checksums/centos_10-x86_64-vhd-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
19e15fb9617defb397c93b7464fad59e86a334e4
72fc190de032d3edf60186f87b9a4f33aa9c1a09
1 change: 1 addition & 0 deletions test/data/manifest-checksums/centos_9-aarch64-azure-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dea110fc4eff8e562226caa8537983ffb1342aa4
1 change: 1 addition & 0 deletions test/data/manifest-checksums/centos_9-x86_64-azure-empty_rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
9f7fcd5de0e8987c4a15cae13efaba14797b59f0
Loading