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

distro/rhel90: rename everything from 85 to 90

Browse source 
Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-08-06 08:13:39 +02:00 • committed by Ondřej Budai
parent d6ade6386d
commit 6693ebc59b
7 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
package rhel85
package rhel90
import (
"encoding/json"
@ -13,12 +13,12 @@ import (
"github.com/osbuild/osbuild-composer/internal/rpmmd"
)
const defaultName = "rhel-85"
const defaultName = "rhel-90"
const rhel86Name = "rhel-86"
const osVersion = "8.5"
const releaseVersion = "8"
const modulePlatformID = "platform:el8"
const ostreeRef = "rhel/8/%s/edge"
const osVersion = "9.0"
const releaseVersion = "9"
const modulePlatformID = "platform:el9"
const ostreeRef = "rhel/9/%s/edge"
const (
// package set names

46
internal/distro/rhel90/distro_test.go
View file

@ -1,4 +1,4 @@
package rhel85_test
package rhel90_test
import (
"fmt"
@ -10,7 +10,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/rhel85"
"github.com/osbuild/osbuild-composer/internal/distro/rhel90"
)
type rhelFamilyDistro struct {
@ -21,7 +21,7 @@ type rhelFamilyDistro struct {
var rhelFamilyDistros = []rhelFamilyDistro{
{
name: "rhel",
distro: rhel85.New(),
distro: rhel90.New(),
},
}
@ -398,7 +398,7 @@ func TestImageTypeAliases(t *testing.T) {
func TestDistro_ManifestError(t *testing.T) {
// Currently, the only unsupported configuration is OSTree commit types
// with Kernel boot options
r8distro := rhel85.New()
r9distro := rhel90.New()
bp := blueprint.Blueprint{
Customizations: &blueprint.Customizations{
Kernel: &blueprint.KernelCustomization{
@ -407,8 +407,8 @@ func TestDistro_ManifestError(t *testing.T) {
},
}
for _, archName := range r8distro.ListArches() {
arch, _ := r8distro.GetArch(archName)
for _, archName := range r9distro.ListArches() {
arch, _ := r9distro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName)
imgOpts := distro.ImageOptions{
@ -496,12 +496,12 @@ func TestArchitecture_ListImageTypes(t *testing.T) {
}
}
func TestRhel85_ListArches(t *testing.T) {
arches := rhel85.New().ListArches()
func TestRhel90_ListArches(t *testing.T) {
arches := rhel90.New().ListArches()
assert.Equal(t, []string{"aarch64", "ppc64le", "s390x", "x86_64"}, arches)
}
func TestRhel85_GetArch(t *testing.T) {
func TestRhel90_GetArch(t *testing.T) {
arches := []struct {
name string
errorExpected bool
@ -541,22 +541,22 @@ func TestRhel85_GetArch(t *testing.T) {
}
}
func TestRhel85_Name(t *testing.T) {
distro := rhel85.New()
assert.Equal(t, "rhel-85", distro.Name())
func TestRhel90_Name(t *testing.T) {
distro := rhel90.New()
assert.Equal(t, "rhel-90", distro.Name())
}
func TestRhel85_ModulePlatformID(t *testing.T) {
distro := rhel85.New()
assert.Equal(t, "platform:el8", distro.ModulePlatformID())
func TestRhel90_ModulePlatformID(t *testing.T) {
distro := rhel90.New()
assert.Equal(t, "platform:el9", distro.ModulePlatformID())
}
func TestRhel85_KernelOption(t *testing.T) {
distro_test_common.TestDistro_KernelOption(t, rhel85.New())
func TestRhel90_KernelOption(t *testing.T) {
distro_test_common.TestDistro_KernelOption(t, rhel90.New())
}
func TestDistro_CustomFileSystemManifestError(t *testing.T) {
r8distro := rhel85.New()
r9distro := rhel90.New()
bp := blueprint.Blueprint{
Customizations: &blueprint.Customizations{
Filesystem: []blueprint.FilesystemCustomization{
@ -567,8 +567,8 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) {
},
},
}
for _, archName := range r8distro.ListArches() {
arch, _ := r8distro.GetArch(archName)
for _, archName := range r9distro.ListArches() {
arch, _ := r9distro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName)
_, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, nil, 0)
@ -584,7 +584,7 @@ func TestDistro_CustomFileSystemManifestError(t *testing.T) {
}
func TestDistro_TestRootMountPoint(t *testing.T) {
r8distro := rhel85.New()
r9distro := rhel90.New()
bp := blueprint.Blueprint{
Customizations: &blueprint.Customizations{
Filesystem: []blueprint.FilesystemCustomization{
@ -595,8 +595,8 @@ func TestDistro_TestRootMountPoint(t *testing.T) {
},
},
}
for _, archName := range r8distro.ListArches() {
arch, _ := r8distro.GetArch(archName)
for _, archName := range r9distro.ListArches() {
arch, _ := r9distro.GetArch(archName)
for _, imgTypeName := range arch.ListImageTypes() {
imgType, _ := arch.GetImageType(imgTypeName)
_, err := imgType.Manifest(bp.Customizations, distro.ImageOptions{}, nil, nil, 0)

2
internal/distro/rhel90/package_sets.go
View file

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

4
internal/distro/rhel90/partition_tables.go
View file

@ -1,4 +1,4 @@
package rhel85
package rhel90
import (
"io"
@ -199,7 +199,7 @@ func ec2PartitionTable(imageOptions distro.ImageOptions, arch distro.Arch, rng *
},
{
Start: 411648,
Size: 1048576,
Size: 1049076,
Type: "C12A7328-F81F-11D2-BA4B-00A0C93EC93B",
UUID: "68B2905B-DF3E-4FB3-80FA-49D1E773AA33",
Filesystem: &disk.Filesystem{

6
internal/distro/rhel90/pipelines.go
View file

@ -1,4 +1,4 @@
package rhel85
package rhel90
import (
"fmt"
@ -293,7 +293,7 @@ func ec2BaseTreePipeline(repos []rpmmd.RepoConfig, packages []rpmmd.PackageSpec,
},
}))
// RHBZ#1822853
// RHBZ#1822903
p.AddStage(osbuild.NewSystemdUnitStage(&osbuild.SystemdUnitStageOptions{
Unit: "nm-cloud-setup.service",
Dropin: "10-rh-enable-for-ec2.conf",
@ -538,7 +538,7 @@ func edgeContainerPipelines(t *imageType, customizations *blueprint.Customizatio
func buildPipeline(repos []rpmmd.RepoConfig, buildPackageSpecs []rpmmd.PackageSpec) *osbuild.Pipeline {
p := new(osbuild.Pipeline)
p.Name = "build"
p.Runner = "org.osbuild.rhel85"
p.Runner = "org.osbuild.rhel90"
p.AddStage(osbuild.NewRPMStage(rpmStageOptions(repos), rpmStageInputs(buildPackageSpecs)))
p.AddStage(osbuild.NewSELinuxStage(selinuxStageOptions(true)))
return p

2
internal/distro/rhel90/stage_inputs.go
View file

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

6
internal/distro/rhel90/stage_options.go
View file

@ -1,4 +1,4 @@
package rhel85
package rhel90
import (
"fmt"
@ -261,7 +261,7 @@ func bootISOMonoStageOptions(kernelVer string, arch string) *osbuild.BootISOMono
if bcj := osbuild.BCJOption(arch); bcj != "" {
comprOptions.BCJ = bcj
}
isolabel := fmt.Sprintf("RHEL-8-5-0-BaseOS-%s", arch)
isolabel := fmt.Sprintf("RHEL-9-0-0-BaseOS-%s", arch)
return &osbuild.BootISOMonoStageOptions{
Product: osbuild.Product{
Name: "Red Hat Enterprise Linux",
@ -302,7 +302,7 @@ func discinfoStageOptions(arch string) *osbuild.DiscinfoStageOptions {
func xorrisofsStageOptions(filename string, arch string) *osbuild.XorrisofsStageOptions {
return &osbuild.XorrisofsStageOptions{
Filename: filename,
VolID: fmt.Sprintf("RHEL-8-5-0-BaseOS-%s", arch),
VolID: fmt.Sprintf("RHEL-9-0-0-BaseOS-%s", arch),
SysID: "LINUX",
Boot: osbuild.XorrisofsBoot{
Image: "isolinux/isolinux.bin",