rhel8: move eapWorkload() into a regular package list

pkg/distro/defs/rhel-8/distro.yaml

@@ -1511,6 +1511,49 @@ image_types:
             - "rhui-azure-rhel8"
           exclude:
             - "firewalld"
+        # from the previous eapWorkload() workload, for simplicity
+        # this is now a normal packageset
+        - include:
+            - "java-1.8.0-openjdk"
+            - "java-1.8.0-openjdk-devel"
+            - "eap7-wildfly"
+            - "eap7-artemis-native-wildfly"
+          exclude:
+            # weak dependencies of the above eapWorkload packages
+            # that we don't need (and were not part of the original
+            # eapWorkload() package set (as it excluded weak deps)
+            - "graphite2"
+            - "libXdamage"
+            - "libXrandr"
+            - "libthai"
+            - "libXfixes"
+            - "atk"
+            - "fribidi"
+            - "jbigkit-libs"
+            - "hicolor-icon-theme"
+            - "libtiff"
+            - "gtk2"
+            - "harfbuzz"
+            - "libXinerama"
+            - "libatrie"
+            - "libXft"
+            - "pango"
+            - "gdk-pixbuf2-modules"
+            - "libXcursor"
+          conditions:
+            "rhel-8.8+ needs to exclude libjpeg-turbo as well":
+              when:
+                version_greater_or_equal: "8.8"
+              append:
+                exclude:
+                  - "libjpeg-turbo"
+            "rhel-8.10 must exclude python3-{webencodings,html5lib":
+              when:
+                version_greater_or_equal: "8.10"
+              append:
+                exclude:
+                  - "python3-webencodings"
+                  - "python3-html5lib"
 
   "image-installer":
     package_sets:

pkg/distro/rhel/rhel8/azure.go

@@ -106,7 +106,6 @@ func mkAzureEap7RhuiImgType(rd *rhel.Distribution, a arch.Arch) *rhel.ImageType
 	it.Bootable = true
 	it.DefaultSize = 64 * datasizes.GibiByte
 	it.BasePartitionTables = partitionTables
-	it.Workload = eapWorkload()
 
 	return it
 }

pkg/distro/rhel/rhel8/distro_test.go

@@ -492,8 +492,6 @@ func TestDistro_ManifestError(t *testing.T) {
 				assert.EqualError(t, err, fmt.Sprintf("%q images require specifying a URL from which to retrieve the OSTree commit", imgTypeName))
 			} else if imgTypeName == "edge-installer" || imgTypeName == "edge-simplified-installer" {
 				assert.EqualError(t, err, fmt.Sprintf("boot ISO image type %q requires specifying a URL from which to retrieve the OSTree commit", imgTypeName))
-			} else if imgTypeName == "azure-eap7-rhui" {
-				assert.EqualError(t, err, fmt.Sprintf(distro.NoCustomizationsAllowedError, imgTypeName))
 			} else {
 				assert.NoError(t, err)
 			}
@@ -670,7 +668,6 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 	for _, archName := range r8distro.ListArches() {
 		arch, _ := r8distro.GetArch(archName)
@@ -704,7 +701,6 @@ func TestDistro_TestRootMountPoint(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 	for _, archName := range r8distro.ListArches() {
 		arch, _ := r8distro.GetArch(archName)
@@ -744,7 +740,6 @@ func TestDistro_CustomFileSystemSubDirectories(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 	for _, archName := range r8distro.ListArches() {
 		arch, _ := r8distro.GetArch(archName)
@@ -790,7 +785,6 @@ func TestDistro_MountpointsWithArbitraryDepthAllowed(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 	for _, archName := range r8distro.ListArches() {
 		arch, _ := r8distro.GetArch(archName)
@@ -832,7 +826,6 @@ func TestDistro_DirtyMountpointsNotAllowed(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 	for _, archName := range r8distro.ListArches() {
 		arch, _ := r8distro.GetArch(archName)
@@ -864,7 +857,6 @@ func TestDistro_CustomUsrPartitionNotLargeEnough(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 	for _, archName := range r8distro.ListArches() {
 		arch, _ := r8distro.GetArch(archName)
@@ -957,7 +949,6 @@ func TestDiskCustomizationsCheckOptions(t *testing.T) {
 		"edge-installer":            true,
 		"edge-simplified-installer": true,
 		"edge-raw-image":            true,
-		"azure-eap7-rhui":           true,
 	}
 
 	for _, archName := range r8distro.ListArches() {

test/data/manifest-checksums/rhel_8.10-x86_64-azure_eap7_rhui-empty_rhel

@@ -1 +1 @@
-0ff31f6862f4a0576820c15e843214ff68e77708
+2b2ac401012dcdaaf1f035da54dac94aadc3d9e1

test/data/manifest-checksums/rhel_8.6-x86_64-azure_eap7_rhui-empty_rhel

@@ -1 +1 @@
-3139b3c75ac9eb434ddb2772dd747daf42f05e77
+4a09fa4c4c0e4b4ec69f808621b05d44ba977f6d

test/data/manifest-checksums/rhel_8.8-x86_64-azure_eap7_rhui-empty_rhel

@@ -1 +1 @@
-8d88c24b7424012784629a66a936577dd3be470c
+422ea29377a70b7adf76529a5f8ee913df43bc75