rhel85: redefine the ami image based on RHEL ec2 images
Redefine the `ami` image type in RHEL-8.5 to be based on RHEL ec2 images. The pipeline has different default settings, therefore the common "os" pipeline is not used. The RHEL ec2 images have a different default size than the original `ami` image definition. The RHEL ec2 images use a different default partitioning scheme. Their configuration is slightly different for each architecture and the x86_64 version of the image does not support UEFI. Update rpmrepo snapshots used to generate RHEL-8.5 x86_64 and aarch64 image test cases. Signed-off-by: Tomas Hozza <thozza@redhat.com>
This commit is contained in:
parent
a2ecf46e04
commit
02ff0fc606
9 changed files with 9967 additions and 9877 deletions
|
|
@ -32,6 +32,13 @@ func ppc64leBuildPackageSet() rpmmd.PackageSet {
|
|||
}
|
||||
}
|
||||
|
||||
// common ec2 image build package set
|
||||
func ec2BuildPackageSet() rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
Include: []string{"python3-pyyaml"},
|
||||
}
|
||||
}
|
||||
|
||||
// common edge image build package set
|
||||
func edgeBuildPackageSet() rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
|
|
@ -171,21 +178,18 @@ func openstackCommonPackageSet() rpmmd.PackageSet {
|
|||
|
||||
}
|
||||
|
||||
func amiCommonPackageSet() rpmmd.PackageSet {
|
||||
func ec2CommonPackageSet() rpmmd.PackageSet {
|
||||
return rpmmd.PackageSet{
|
||||
Include: []string{
|
||||
"@core", "cloud-init", "cloud-utils-growpart", "yum-utils",
|
||||
"dracut-config-generic", "dracut-norescue", "gdisk", "grub2",
|
||||
"insights-client", "NetworkManager", "NetworkManager-cloud-setup",
|
||||
"redhat-release", "redhat-release-eula", "rsync", "tar",
|
||||
|
||||
// TODO this doesn't exist in BaseOS or AppStream
|
||||
// "rh-amazon-rhui-client",
|
||||
|
||||
"@core", "authselect-compat", "chrony", "cloud-init", "cloud-utils-growpart",
|
||||
"dhcp-client", "yum-utils", "dracut-config-generic", "dracut-norescue", "gdisk",
|
||||
"grub2", "insights-client", "langpacks-en", "NetworkManager",
|
||||
"NetworkManager-cloud-setup", "redhat-release",
|
||||
"redhat-release-eula", "rsync", "tar", "qemu-guest-agent",
|
||||
},
|
||||
Exclude: []string{
|
||||
"aic94xx-firmware", "alsa-firmware", "alsa-lib",
|
||||
"alsa-tools-firmware", "biosdevname", "iprutils", "ivtv-firmware",
|
||||
"alsa-tools-firmware", "biosdevname", "firewalld", "iprutils", "ivtv-firmware",
|
||||
"iwl1000-firmware", "iwl100-firmware", "iwl105-firmware",
|
||||
"iwl135-firmware", "iwl2000-firmware", "iwl2030-firmware",
|
||||
"iwl3160-firmware", "iwl3945-firmware", "iwl4965-firmware",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue