Skip to content

Commit

Permalink
distro/rhel8: remove version lock on 8.10 for SAP
Browse files Browse the repository at this point in the history
Version lock should not exist on 8.10 for SAP.  It's the last RHEL
release in the 8.* stream.

See COMPOSER-2252
  • Loading branch information
achilleas-k authored and thozza committed May 23, 2024
1 parent 31c1e69 commit bbab259
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions pkg/distro/rhel/rhel8/sap.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

// sapImageConfig returns the SAP specific ImageConfig data
func sapImageConfig(rd distro.Distro) *distro.ImageConfig {
return &distro.ImageConfig{
ic := &distro.ImageConfig{
SELinuxConfig: &osbuild.SELinuxConfigStageOptions{
State: osbuild.SELinuxStatePermissive,
},
Expand Down Expand Up @@ -105,8 +105,11 @@ func sapImageConfig(rd distro.Distro) *distro.ImageConfig {
},
),
},
}

if common.VersionLessThan(rd.OsVersion(), "8.10") {
// E4S/EUS
DNFConfig: []*osbuild.DNFConfigStageOptions{
ic.DNFConfig = []*osbuild.DNFConfigStageOptions{
osbuild.NewDNFConfigStageOptions(
[]osbuild.DNFVariable{
{
Expand All @@ -116,8 +119,10 @@ func sapImageConfig(rd distro.Distro) *distro.ImageConfig {
},
nil,
),
},
}
}

return ic
}

func SapPackageSet(t *rhel.ImageType) rpmmd.PackageSet {
Expand Down

0 comments on commit bbab259

Please sign in to comment.