distro/rhel90 -> distro/rhel90beta: rename package

- Rename rhel90 package to rhel90beta.
- Adjust all imports
- Adjust tests
This commit is contained in:
Achilleas Koutsou 2021-10-08 16:36:58 +02:00 committed by Tomáš Hozza
parent 972b9ee14e
commit cac3fa10db
8 changed files with 16 additions and 11 deletions

View file

@ -1,4 +1,4 @@
package rhel90
package rhel90beta
import (
"encoding/json"

View file

@ -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())
}

View file

@ -1,4 +1,4 @@
package rhel90
package rhel90beta
// This file defines package sets that are used by more than one image type.

View file

@ -1,4 +1,4 @@
package rhel90
package rhel90beta
import (
"github.com/osbuild/osbuild-composer/internal/disk"

View file

@ -1,4 +1,4 @@
package rhel90
package rhel90beta
import (
"fmt"

View file

@ -1,4 +1,4 @@
package rhel90
package rhel90beta
import (
osbuild "github.com/osbuild/osbuild-composer/internal/osbuild2"

View file

@ -1,4 +1,4 @@
package rhel90
package rhel90beta
import (
"fmt"

View file

@ -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 {