diff --git a/internal/distro/rhel90/distro.go b/internal/distro/rhel90beta/distro.go similarity index 99% rename from internal/distro/rhel90/distro.go rename to internal/distro/rhel90beta/distro.go index 2c6a49838..8876bdaea 100644 --- a/internal/distro/rhel90/distro.go +++ b/internal/distro/rhel90beta/distro.go @@ -1,4 +1,4 @@ -package rhel90 +package rhel90beta import ( "encoding/json" diff --git a/internal/distro/rhel90/distro_test.go b/internal/distro/rhel90beta/distro_test.go similarity index 98% rename from internal/distro/rhel90/distro_test.go rename to internal/distro/rhel90beta/distro_test.go index e3492d39a..1b5ee9ef9 100644 --- a/internal/distro/rhel90/distro_test.go +++ b/internal/distro/rhel90beta/distro_test.go @@ -1,4 +1,4 @@ -package rhel90_test +package rhel90beta_test import ( "fmt" @@ -11,7 +11,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/blueprint" "github.com/osbuild/osbuild-composer/internal/distro" "github.com/osbuild/osbuild-composer/internal/distro/distro_test_common" - "github.com/osbuild/osbuild-composer/internal/distro/rhel90" + rhel90 "github.com/osbuild/osbuild-composer/internal/distro/rhel90beta" ) type rhelFamilyDistro struct { @@ -554,6 +554,11 @@ func TestRhel90_GetArch(t *testing.T) { func TestRhel90_Name(t *testing.T) { distro := rhel90.New() + assert.Equal(t, "rhel-90-beta", distro.Name()) +} + +func TestRhel90Base_Name(t *testing.T) { + distro := rhel90.NewRHEL90() assert.Equal(t, "rhel-90", distro.Name()) } diff --git a/internal/distro/rhel90/package_sets.go b/internal/distro/rhel90beta/package_sets.go similarity index 99% rename from internal/distro/rhel90/package_sets.go rename to internal/distro/rhel90beta/package_sets.go index 7290e4100..d356494de 100644 --- a/internal/distro/rhel90/package_sets.go +++ b/internal/distro/rhel90beta/package_sets.go @@ -1,4 +1,4 @@ -package rhel90 +package rhel90beta // This file defines package sets that are used by more than one image type. diff --git a/internal/distro/rhel90/partition_tables.go b/internal/distro/rhel90beta/partition_tables.go similarity index 99% rename from internal/distro/rhel90/partition_tables.go rename to internal/distro/rhel90beta/partition_tables.go index 461a33846..49b66fe96 100644 --- a/internal/distro/rhel90/partition_tables.go +++ b/internal/distro/rhel90beta/partition_tables.go @@ -1,4 +1,4 @@ -package rhel90 +package rhel90beta import ( "github.com/osbuild/osbuild-composer/internal/disk" diff --git a/internal/distro/rhel90/pipelines.go b/internal/distro/rhel90beta/pipelines.go similarity index 99% rename from internal/distro/rhel90/pipelines.go rename to internal/distro/rhel90beta/pipelines.go index ef775faa3..8a1803cea 100644 --- a/internal/distro/rhel90/pipelines.go +++ b/internal/distro/rhel90beta/pipelines.go @@ -1,4 +1,4 @@ -package rhel90 +package rhel90beta import ( "fmt" diff --git a/internal/distro/rhel90/stage_inputs.go b/internal/distro/rhel90beta/stage_inputs.go similarity index 99% rename from internal/distro/rhel90/stage_inputs.go rename to internal/distro/rhel90beta/stage_inputs.go index b96b513c2..19ca6e8d9 100644 --- a/internal/distro/rhel90/stage_inputs.go +++ b/internal/distro/rhel90beta/stage_inputs.go @@ -1,4 +1,4 @@ -package rhel90 +package rhel90beta import ( osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2" diff --git a/internal/distro/rhel90/stage_options.go b/internal/distro/rhel90beta/stage_options.go similarity index 99% rename from internal/distro/rhel90/stage_options.go rename to internal/distro/rhel90beta/stage_options.go index 7456136fc..46758f1bb 100644 --- a/internal/distro/rhel90/stage_options.go +++ b/internal/distro/rhel90beta/stage_options.go @@ -1,4 +1,4 @@ -package rhel90 +package rhel90beta import ( "fmt" diff --git a/internal/distroregistry/distroregistry.go b/internal/distroregistry/distroregistry.go index 41b81e718..f9a8a16df 100644 --- a/internal/distroregistry/distroregistry.go +++ b/internal/distroregistry/distroregistry.go @@ -11,7 +11,7 @@ import ( "github.com/osbuild/osbuild-composer/internal/distro/rhel84" "github.com/osbuild/osbuild-composer/internal/distro/rhel85" "github.com/osbuild/osbuild-composer/internal/distro/rhel86" - "github.com/osbuild/osbuild-composer/internal/distro/rhel90" + "github.com/osbuild/osbuild-composer/internal/distro/rhel90beta" ) // When adding support for a new distribution, add it here. @@ -26,8 +26,8 @@ var supportedDistros = []supportedDistro{ {rhel84.NewCentos, rhel84.NewCentosHostDistro}, {rhel85.New, rhel85.NewHostDistro}, {rhel86.New, rhel86.NewHostDistro}, - {rhel90.New, rhel90.NewHostDistro}, - {rhel90.NewRHEL90, rhel90.NewHostDistro}, + {rhel90beta.New, rhel90beta.NewHostDistro}, + {rhel90beta.NewRHEL90, rhel90beta.NewHostDistro}, } type supportedDistro struct {