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

distro/rhel8: update ami and ec2 images to new definitions

Browse source
This commit is contained in:
Achilleas Koutsou 2023-01-10 17:05:04 +01:00 • committed by Tomáš Hozza
parent ae01dc36d8
commit e1ebb55d0a
2 changed files with 36 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

74
internal/distro/rhel8/ami.go
View file

@ -13,8 +13,7 @@ func amiImgTypeX86_64(rd distribution) imageType {
filename: "image.raw", filename: "image.raw",
mimeType: "application/octet-stream", mimeType: "application/octet-stream",
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
buildPkgsKey: ec2BuildPackageSet, osPkgsKey: ec2CommonPackageSet,
osPkgsKey: ec2CommonPackageSet,
}, },
packageSetChains: map[string][]string{ packageSetChains: map[string][]string{
osPkgsKey: {osPkgsKey, blueprintPkgsKey}, osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@ -24,7 +23,7 @@ func amiImgTypeX86_64(rd distribution) imageType {
bootable: true, bootable: true,
bootType: distro.LegacyBootType, bootType: distro.LegacyBootType,
defaultSize: 10 * common.GibiByte, defaultSize: 10 * common.GibiByte,
pipelines: ec2Pipelines, image: liveImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "image"}, payloadPipelines: []string{"os", "image"},
exports: []string{"image"}, exports: []string{"image"},
@ -36,12 +35,12 @@ func amiImgTypeX86_64(rd distribution) imageType {
func ec2ImgTypeX86_64(rd distribution) imageType { func ec2ImgTypeX86_64(rd distribution) imageType {
it := imageType{ it := imageType{
name: "ec2", name: "ec2",
filename: "image.raw.xz", filename: "image.raw.xz",
mimeType: "application/xz", mimeType: "application/xz",
compression: "xz",
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
buildPkgsKey: ec2BuildPackageSet, osPkgsKey: rhelEc2PackageSet,
osPkgsKey: rhelEc2PackageSet,
}, },
packageSetChains: map[string][]string{ packageSetChains: map[string][]string{
osPkgsKey: {osPkgsKey, blueprintPkgsKey}, osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@ -51,10 +50,10 @@ func ec2ImgTypeX86_64(rd distribution) imageType {
bootable: true, bootable: true,
bootType: distro.LegacyBootType, bootType: distro.LegacyBootType,
defaultSize: 10 * common.GibiByte, defaultSize: 10 * common.GibiByte,
pipelines: rhelEc2Pipelines, image: liveImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "image", "archive"}, payloadPipelines: []string{"os", "image", "xz"},
exports: []string{"archive"}, exports: []string{"xz"},
basePartitionTables: ec2BasePartitionTables, basePartitionTables: ec2BasePartitionTables,
} }
return it return it
@ -62,12 +61,12 @@ func ec2ImgTypeX86_64(rd distribution) imageType {
func ec2HaImgTypeX86_64(rd distribution) imageType { func ec2HaImgTypeX86_64(rd distribution) imageType {
it := imageType{ it := imageType{
name: "ec2-ha", name: "ec2-ha",
filename: "image.raw.xz", filename: "image.raw.xz",
mimeType: "application/xz", mimeType: "application/xz",
compression: "xz",
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
buildPkgsKey: ec2BuildPackageSet, osPkgsKey: rhelEc2HaPackageSet,
osPkgsKey: rhelEc2HaPackageSet,
}, },
packageSetChains: map[string][]string{ packageSetChains: map[string][]string{
osPkgsKey: {osPkgsKey, blueprintPkgsKey}, osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@ -77,10 +76,10 @@ func ec2HaImgTypeX86_64(rd distribution) imageType {
bootable: true, bootable: true,
bootType: distro.LegacyBootType, bootType: distro.LegacyBootType,
defaultSize: 10 * common.GibiByte, defaultSize: 10 * common.GibiByte,
pipelines: rhelEc2Pipelines, image: liveImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "image", "archive"}, payloadPipelines: []string{"os", "image", "xz"},
exports: []string{"archive"}, exports: []string{"xz"},
basePartitionTables: ec2BasePartitionTables, basePartitionTables: ec2BasePartitionTables,
} }
return it return it
@ -92,8 +91,7 @@ func amiImgTypeAarch64(rd distribution) imageType {
filename: "image.raw", filename: "image.raw",
mimeType: "application/octet-stream", mimeType: "application/octet-stream",
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
buildPkgsKey: ec2BuildPackageSet, osPkgsKey: ec2CommonPackageSet,
osPkgsKey: ec2CommonPackageSet,
}, },
packageSetChains: map[string][]string{ packageSetChains: map[string][]string{
osPkgsKey: {osPkgsKey, blueprintPkgsKey}, osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@ -102,7 +100,7 @@ func amiImgTypeAarch64(rd distribution) imageType {
kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto",
bootable: true, bootable: true,
defaultSize: 10 * common.GibiByte, defaultSize: 10 * common.GibiByte,
pipelines: ec2Pipelines, image: liveImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "image"}, payloadPipelines: []string{"os", "image"},
exports: []string{"image"}, exports: []string{"image"},
@ -113,12 +111,12 @@ func amiImgTypeAarch64(rd distribution) imageType {
func ec2ImgTypeAarch64(rd distribution) imageType { func ec2ImgTypeAarch64(rd distribution) imageType {
it := imageType{ it := imageType{
name: "ec2", name: "ec2",
filename: "image.raw.xz", filename: "image.raw.xz",
mimeType: "application/xz", mimeType: "application/xz",
compression: "xz",
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
buildPkgsKey: ec2BuildPackageSet, osPkgsKey: rhelEc2PackageSet,
osPkgsKey: rhelEc2PackageSet,
}, },
packageSetChains: map[string][]string{ packageSetChains: map[string][]string{
osPkgsKey: {osPkgsKey, blueprintPkgsKey}, osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@ -127,10 +125,10 @@ func ec2ImgTypeAarch64(rd distribution) imageType {
kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto", kernelOptions: "console=ttyS0,115200n8 console=tty0 net.ifnames=0 rd.blacklist=nouveau nvme_core.io_timeout=4294967295 iommu.strict=0 crashkernel=auto",
bootable: true, bootable: true,
defaultSize: 10 * common.GibiByte, defaultSize: 10 * common.GibiByte,
pipelines: rhelEc2Pipelines, image: liveImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "image", "archive"}, payloadPipelines: []string{"os", "image", "xz"},
exports: []string{"archive"}, exports: []string{"xz"},
basePartitionTables: ec2BasePartitionTables, basePartitionTables: ec2BasePartitionTables,
} }
return it return it
@ -138,12 +136,12 @@ func ec2ImgTypeAarch64(rd distribution) imageType {
func ec2SapImgTypeX86_64(rd distribution) imageType { func ec2SapImgTypeX86_64(rd distribution) imageType {
it := imageType{ it := imageType{
name: "ec2-sap", name: "ec2-sap",
filename: "image.raw.xz", filename: "image.raw.xz",
mimeType: "application/xz", mimeType: "application/xz",
compression: "xz",
packageSets: map[string]packageSetFunc{ packageSets: map[string]packageSetFunc{
buildPkgsKey: ec2BuildPackageSet, osPkgsKey: rhelEc2SapPackageSet,
osPkgsKey: rhelEc2SapPackageSet,
}, },
packageSetChains: map[string][]string{ packageSetChains: map[string][]string{
osPkgsKey: {osPkgsKey, blueprintPkgsKey}, osPkgsKey: {osPkgsKey, blueprintPkgsKey},
@ -153,10 +151,10 @@ func ec2SapImgTypeX86_64(rd distribution) imageType {
bootable: true, bootable: true,
bootType: distro.LegacyBootType, bootType: distro.LegacyBootType,
defaultSize: 10 * common.GibiByte, defaultSize: 10 * common.GibiByte,
pipelines: rhelEc2Pipelines, image: liveImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "image", "archive"}, payloadPipelines: []string{"os", "image", "xz"},
exports: []string{"archive"}, exports: []string{"xz"},
basePartitionTables: ec2BasePartitionTables, basePartitionTables: ec2BasePartitionTables,
} }
return it return it

42
internal/distro/rhel8/pipelines.go
View file

@ -56,48 +56,6 @@ func vmdkPipelines(t *imageType, customizations *blueprint.Customizations, optio
return pipelines, nil return pipelines, nil
} }
func ec2CommonPipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions,
repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, containers []container.Spec,
rng *rand.Rand, diskfile string) ([]osbuild.Pipeline, error) {
pipelines := make([]osbuild.Pipeline, 0)
pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner.String()))
partitionTable, err := t.getPartitionTable(customizations.GetFilesystems(), options, rng)
if err != nil {
return nil, err
}
treePipeline, err := osPipeline(t, repos, packageSetSpecs[osPkgsKey], containers, customizations, options, partitionTable)
if err != nil {
return nil, err
}
pipelines = append(pipelines, *treePipeline)
kernelVer := rpmmd.GetVerStrFromPackageSpecListPanic(packageSetSpecs[osPkgsKey], customizations.GetKernel().Name)
imagePipeline := liveImagePipeline(treePipeline.Name, diskfile, partitionTable, t.arch, kernelVer)
pipelines = append(pipelines, *imagePipeline)
return pipelines, nil
}
// ec2Pipelines returns pipelines which produce uncompressed EC2 images which are expected to use RHSM for content
func ec2Pipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, containers []container.Spec, rng *rand.Rand) ([]osbuild.Pipeline, error) {
return ec2CommonPipelines(t, customizations, options, repos, packageSetSpecs, containers, rng, t.Filename())
}
// rhelEc2Pipelines returns pipelines which produce XZ-compressed EC2 images which are expected to use RHUI for content
func rhelEc2Pipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, containers []container.Spec, rng *rand.Rand) ([]osbuild.Pipeline, error) {
rawImageFilename := "image.raw"
pipelines, err := ec2CommonPipelines(t, customizations, options, repos, packageSetSpecs, containers, rng, rawImageFilename)
if err != nil {
return nil, err
}
lastPipeline := pipelines[len(pipelines)-1]
pipelines = append(pipelines, *xzArchivePipeline(lastPipeline.Name, rawImageFilename, t.Filename()))
return pipelines, nil
}
func gcePipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, containers []container.Spec, rng *rand.Rand) ([]osbuild.Pipeline, error) { func gcePipelines(t *imageType, customizations *blueprint.Customizations, options distro.ImageOptions, repos []rpmmd.RepoConfig, packageSetSpecs map[string][]rpmmd.PackageSpec, containers []container.Spec, rng *rand.Rand) ([]osbuild.Pipeline, error) {
pipelines := make([]osbuild.Pipeline, 0) pipelines := make([]osbuild.Pipeline, 0)
pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner.String())) pipelines = append(pipelines, *buildPipeline(repos, packageSetSpecs[buildPkgsKey], t.arch.distro.runner.String()))