From 0bf09ba60c71eea51edb2000f2ec91ff76db3d03 Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Tue, 5 Jul 2022 19:43:26 +0200
Subject: [PATCH] distro/rhel8: separate minor-version-specific image types

edge-raw and edge-simplified-installer: only on 8.6+
ec2 and ec2-ha: available on all RHEL 8
ec2-sap: available on 8.4 and 8.6+ (no 8.5)

The ec2-sap image requires ansible, which in 8.4 is called `ansible` and
was replaced by `ansible-core` in 8.6.
---
 internal/distro/rhel8/distro.go       | 22 ++++++++++++++--------
 internal/distro/rhel8/package_sets.go | 12 +++++++++++-
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/internal/distro/rhel8/distro.go b/internal/distro/rhel8/distro.go
index 0ee59ad7d..301170d93 100644
--- a/internal/distro/rhel8/distro.go
+++ b/internal/distro/rhel8/distro.go
@@ -1869,21 +1869,27 @@ func newDistro(distroName string) distro.Distro {
 	)
 
 	if rd.isRHEL() {
+		if !versionLessThan(rd.osVersion, "8.6") {
+			// image types only available on 8.6 and later on RHEL
+			// These edge image types require FDO which aren't available on older versions
+			x86_64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
+			aarch64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
+		}
+
 		// add azure to RHEL distro only
 		x86_64.addImageTypes(azureRhuiImgType)
 
 		// add ec2 image types to RHEL distro only
 		x86_64.addImageTypes(ec2ImgTypeX86_64, ec2HaImgTypeX86_64)
-		if !versionLessThan(rd.osVersion, "8.6") {
-			x86_64.addImageTypes(ec2SapImgTypeX86_64)
-
-			// edge simplified installer is only available on 8.6 and later on RHEL
-			x86_64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
-			aarch64.addImageTypes(edgeSimplifiedInstallerImgType, edgeRawImgType)
-		}
-
 		aarch64.addImageTypes(ec2ImgTypeAarch64)
 
+		if rd.osVersion != "8.5" {
+			// NOTE: RHEL 8.5 is going away and these image types require some
+			// work to get working, so we just disable them here until the
+			// whole distro gets deleted
+			x86_64.addImageTypes(ec2SapImgTypeX86_64)
+		}
+
 		// add GCE RHUI image to RHEL only
 		x86_64.addImageTypes(gceRhuiImgType)
 
diff --git a/internal/distro/rhel8/package_sets.go b/internal/distro/rhel8/package_sets.go
index 8ddf3261d..c872a2071 100644
--- a/internal/distro/rhel8/package_sets.go
+++ b/internal/distro/rhel8/package_sets.go
@@ -606,7 +606,6 @@ func rhelEc2SapPackageSet(t *imageType) rpmmd.PackageSet {
 		"@Server",
 		// SAP System Roles
 		// https://access.redhat.com/sites/default/files/attachments/rhel_system_roles_for_sap_1.pdf
-		"ansible-core", // RHBZ#2077356
 		"rhel-system-roles-sap",
 		// RHBZ#1959813
 		"bind-utils",
@@ -641,6 +640,17 @@ func rhelEc2SapPackageSet(t *imageType) rpmmd.PackageSet {
 		// RHUI client
 		"rh-amazon-rhui-client-sap-bundle-e4s",
 	)
+
+	if t.arch.distro.osVersion == "8.4" {
+		ec2SapPackageSet = ec2SapPackageSet.Append(rpmmd.PackageSet{
+			Include: []string{"ansible"},
+		})
+	} else {
+		// 8.6+ and CS8 (image type does not exist on 8.5)
+		ec2SapPackageSet = ec2SapPackageSet.Append(rpmmd.PackageSet{
+			Include: []string{"ansible-core"}, // RHBZ#2077356
+		})
+	}
 	return ec2SapPackageSet
 }