diff --git a/internal/workload/anaconda.go b/internal/workload/anaconda.go deleted file mode 100644 index b4a5e50c00..0000000000 --- a/internal/workload/anaconda.go +++ /dev/null @@ -1,7 +0,0 @@ -package workload - -// TODO: replace the Anaconda pipeline by the OS pipeline with the -// anaconda workload. -type Anaconda struct { - BaseWorkload -} diff --git a/internal/workload/sap.go b/internal/workload/sap.go deleted file mode 100644 index 0f066b78ce..0000000000 --- a/internal/workload/sap.go +++ /dev/null @@ -1,6 +0,0 @@ -package workload - -// TODO! -type SAP struct { - BaseWorkload -} diff --git a/internal/workload/static_webserver.go b/internal/workload/static_webserver.go deleted file mode 100644 index c069240504..0000000000 --- a/internal/workload/static_webserver.go +++ /dev/null @@ -1,7 +0,0 @@ -package workload - -// TODO: replace the CommitServerTree pipeline by the OS pipeline with the -// StaticWebserver workload. -type StaticWebserver struct { - BaseWorkload -} diff --git a/pkg/distro/defs/rhel-8/distro.yaml b/pkg/distro/defs/rhel-8/distro.yaml index 481fcbd4f8..dea799896a 100644 --- a/pkg/distro/defs/rhel-8/distro.yaml +++ b/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: diff --git a/pkg/distro/rhel/rhel8/azure.go b/pkg/distro/rhel/rhel8/azure.go index f3e8587595..52205ea638 100644 --- a/pkg/distro/rhel/rhel8/azure.go +++ b/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 } diff --git a/pkg/distro/rhel/rhel8/distro_test.go b/pkg/distro/rhel/rhel8/distro_test.go index b3c29175e5..489416e21c 100644 --- a/pkg/distro/rhel/rhel8/distro_test.go +++ b/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() { diff --git a/pkg/distro/rhel/rhel8/workloads.go b/pkg/distro/rhel/rhel8/workloads.go deleted file mode 100644 index ad6c7fb83c..0000000000 --- a/pkg/distro/rhel/rhel8/workloads.go +++ /dev/null @@ -1,26 +0,0 @@ -package rhel8 - -import "github.com/osbuild/images/internal/workload" - -// rhel8Workload is a RHEL-8-specific implementation of the workload interface -// for internal workload variants. -type rhel8Workload struct { - workload.BaseWorkload - packages []string -} - -func (w rhel8Workload) GetPackages() []string { - return w.packages -} - -func eapWorkload() workload.Workload { - w := rhel8Workload{} - w.packages = []string{ - "java-1.8.0-openjdk", - "java-1.8.0-openjdk-devel", - "eap7-wildfly", - "eap7-artemis-native-wildfly", - } - - return &w -} diff --git a/test/data/manifest-checksums/rhel_8.10-x86_64-azure_eap7_rhui-empty_rhel b/test/data/manifest-checksums/rhel_8.10-x86_64-azure_eap7_rhui-empty_rhel index 5e0b1e0cc8..222c984fe8 100644 --- a/test/data/manifest-checksums/rhel_8.10-x86_64-azure_eap7_rhui-empty_rhel +++ b/test/data/manifest-checksums/rhel_8.10-x86_64-azure_eap7_rhui-empty_rhel @@ -1 +1 @@ -0ff31f6862f4a0576820c15e843214ff68e77708 +2b2ac401012dcdaaf1f035da54dac94aadc3d9e1 diff --git a/test/data/manifest-checksums/rhel_8.6-x86_64-azure_eap7_rhui-empty_rhel b/test/data/manifest-checksums/rhel_8.6-x86_64-azure_eap7_rhui-empty_rhel index c900c89b4f..f28a1b8ef7 100644 --- a/test/data/manifest-checksums/rhel_8.6-x86_64-azure_eap7_rhui-empty_rhel +++ b/test/data/manifest-checksums/rhel_8.6-x86_64-azure_eap7_rhui-empty_rhel @@ -1 +1 @@ -3139b3c75ac9eb434ddb2772dd747daf42f05e77 +4a09fa4c4c0e4b4ec69f808621b05d44ba977f6d diff --git a/test/data/manifest-checksums/rhel_8.8-x86_64-azure_eap7_rhui-empty_rhel b/test/data/manifest-checksums/rhel_8.8-x86_64-azure_eap7_rhui-empty_rhel index aebc812ec0..581a26e735 100644 --- a/test/data/manifest-checksums/rhel_8.8-x86_64-azure_eap7_rhui-empty_rhel +++ b/test/data/manifest-checksums/rhel_8.8-x86_64-azure_eap7_rhui-empty_rhel @@ -1 +1 @@ -8d88c24b7424012784629a66a936577dd3be470c +422ea29377a70b7adf76529a5f8ee913df43bc75