particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rhel90: drop -ga suffix and alias from beta

Browse source 
`rhel-90` now refers to the RHEL 9.0 distro (rhel90 package) and the
beta is only referred to by `rhel-90-beta`.
This commit is contained in:
Achilleas Koutsou 2021-11-08 11:18:45 +01:00 • committed by Ondřej Budai
parent affe02ceed
commit 5765d5af9a
4 changed files with 4 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/distro/rhel90/distro.go
View file

@ -54,8 +54,8 @@ type distribution struct {
// distribution objects without the arches > image types
var distroMap = map[string]distribution{
"rhel-90-ga": {
name: "rhel-90-ga",
"rhel-90": {
name: "rhel-90",
product: "Red Hat Enterprise Linux",
osVersion: "9.0",
releaseVersion: "9",
@ -489,11 +489,11 @@ func (t *imageType) checkOptions(customizations *blueprint.Customizations, optio
// New creates a new distro object, defining the supported architectures and image types
func New() distro.Distro {
return newDistro("rhel-90-ga")
return newDistro("rhel-90")
}
func NewHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
return newDistro("rhel-90-ga")
return newDistro("rhel-90")
}
func NewCentos() distro.Distro {

5
internal/distro/rhel90beta/distro.go
View file

@ -17,7 +17,6 @@ import (
)
const defaultName = "rhel-90-beta"
const baseAliasName = "rhel-90"
const osVersion = "9.0"
const releaseVersion = "9"
const modulePlatformID = "platform:el9"
@ -488,10 +487,6 @@ func New() distro.Distro {
return newDistro(defaultName, modulePlatformID, ostreeRef)
}
func NewRHEL90() distro.Distro {
return newDistro(baseAliasName, modulePlatformID, ostreeRef)
}
func NewHostDistro(name, modulePlatformID, ostreeRef string) distro.Distro {
return newDistro(name, modulePlatformID, ostreeRef)
}

5
internal/distro/rhel90beta/distro_test.go
View file

@ -557,11 +557,6 @@ func TestRhel90_Name(t *testing.T) {
assert.Equal(t, "rhel-90-beta", distro.Name())
}
func TestRhel90Base_Name(t *testing.T) {
distro := rhel90.NewRHEL90()
assert.Equal(t, "rhel-90", distro.Name())
}
func TestRhel90_ModulePlatformID(t *testing.T) {
distro := rhel90.New()
assert.Equal(t, "platform:el9", distro.ModulePlatformID())

1
internal/distroregistry/distroregistry.go
View file

@ -28,7 +28,6 @@ var supportedDistros = []supportedDistro{
{rhel86.New, rhel86.NewHostDistro},
{rhel86.NewCentos, rhel86.NewCentosHostDistro},
{rhel90beta.New, rhel90beta.NewHostDistro},
{rhel90beta.NewRHEL90, rhel90beta.NewHostDistro},
{rhel90.New, rhel90.NewHostDistro},
{rhel90.NewCentos, rhel90.NewCentosHostDistro},
}