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

distro: fix pipeline names in Fedora and RHEL 9 image types

Browse source 
Some pipeline lists weren't updated when the image types were rewritten.
Discovered now from the new test and fixed.
This commit is contained in:
Achilleas Koutsou 2023-01-17 20:56:40 +01:00 • committed by Tomáš Hozza
parent f102ae6b04
commit e9d1e8a222
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
internal/distro/fedora/distro.go
View file

@ -86,7 +86,7 @@ var (
rpmOstree: false, rpmOstree: false,
image: imageInstallerImage, image: imageInstallerImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "anaconda-tree", "rootfs-image", "efiboot-tree", "bootiso-tree"}, payloadPipelines: []string{"anaconda-tree", "rootfs-image", "efiboot-tree", "os", "bootiso-tree", "bootiso"},
exports: []string{"bootiso"}, exports: []string{"bootiso"},
} }
@ -126,7 +126,7 @@ var (
bootISO: false, bootISO: false,
image: iotContainerImage, image: iotContainerImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"ostree-tree", "ostree-commit", "container-tree", "container"}, payloadPipelines: []string{"os", "ostree-commit", "container-tree", "container"},
exports: []string{"container"}, exports: []string{"container"},
} }
@ -146,7 +146,7 @@ var (
bootISO: true, bootISO: true,
image: iotInstallerImage, image: iotInstallerImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"anaconda-tree", "rootfs-image", "efiboot-tree", "bootiso-tree"}, payloadPipelines: []string{"anaconda-tree", "rootfs-image", "efiboot-tree", "bootiso-tree", "bootiso"},
exports: []string{"bootiso"}, exports: []string{"bootiso"},
} }

6
internal/distro/rhel9/bare_metal.go
View file

@ -22,8 +22,8 @@ var (
}, },
image: tarImage, image: tarImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "root-tar"}, payloadPipelines: []string{"os", "archive"},
exports: []string{"root-tar"}, exports: []string{"archive"},
} }
imageInstaller = imageType{ imageInstaller = imageType{
@ -39,7 +39,7 @@ var (
bootable: true, bootable: true,
image: imageInstallerImage, image: imageInstallerImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"os", "anaconda-tree", "bootiso-tree", "bootiso"}, payloadPipelines: []string{"anaconda-tree", "rootfs-image", "efiboot-tree", "os", "bootiso-tree", "bootiso"},
exports: []string{"bootiso"}, exports: []string{"bootiso"},
} }
) )

2
internal/distro/rhel9/edge.go
View file

@ -124,7 +124,7 @@ var (
bootISO: true, bootISO: true,
image: edgeSimplifiedInstallerImage, image: edgeSimplifiedInstallerImage,
buildPipelines: []string{"build"}, buildPipelines: []string{"build"},
payloadPipelines: []string{"image-tree", "image", "archive", "coi-tree", "efiboot-tree", "bootiso-tree", "bootiso"}, payloadPipelines: []string{"image-tree", "image", "xz", "coi-tree", "efiboot-tree", "bootiso-tree", "bootiso"},
exports: []string{"bootiso"}, exports: []string{"bootiso"},
basePartitionTables: edgeBasePartitionTables, basePartitionTables: edgeBasePartitionTables,
} }