From e9d1e8a22280d3d360f59f58e21860da7d2ec59c Mon Sep 17 00:00:00 2001
From: Achilleas Koutsou <achilleas@koutsou.net>
Date: Tue, 17 Jan 2023 20:56:40 +0100
Subject: [PATCH] distro: fix pipeline names in Fedora and RHEL 9 image types

Some pipeline lists weren't updated when the image types were rewritten.
Discovered now from the new test and fixed.
---
 internal/distro/fedora/distro.go    | 6 +++---
 internal/distro/rhel9/bare_metal.go | 6 +++---
 internal/distro/rhel9/edge.go       | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/distro/fedora/distro.go b/internal/distro/fedora/distro.go
index f8c1ecbfd..d714ec2e9 100644
--- a/internal/distro/fedora/distro.go
+++ b/internal/distro/fedora/distro.go
@@ -86,7 +86,7 @@ var (
 		rpmOstree:        false,
 		image:            imageInstallerImage,
 		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"},
 	}
 
@@ -126,7 +126,7 @@ var (
 		bootISO:          false,
 		image:            iotContainerImage,
 		buildPipelines:   []string{"build"},
-		payloadPipelines: []string{"ostree-tree", "ostree-commit", "container-tree", "container"},
+		payloadPipelines: []string{"os", "ostree-commit", "container-tree", "container"},
 		exports:          []string{"container"},
 	}
 
@@ -146,7 +146,7 @@ var (
 		bootISO:          true,
 		image:            iotInstallerImage,
 		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"},
 	}
 
diff --git a/internal/distro/rhel9/bare_metal.go b/internal/distro/rhel9/bare_metal.go
index cf13dc4b3..62d782705 100644
--- a/internal/distro/rhel9/bare_metal.go
+++ b/internal/distro/rhel9/bare_metal.go
@@ -22,8 +22,8 @@ var (
 		},
 		image:            tarImage,
 		buildPipelines:   []string{"build"},
-		payloadPipelines: []string{"os", "root-tar"},
-		exports:          []string{"root-tar"},
+		payloadPipelines: []string{"os", "archive"},
+		exports:          []string{"archive"},
 	}
 
 	imageInstaller = imageType{
@@ -39,7 +39,7 @@ var (
 		bootable:         true,
 		image:            imageInstallerImage,
 		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"},
 	}
 )
diff --git a/internal/distro/rhel9/edge.go b/internal/distro/rhel9/edge.go
index f604019fc..4d5fb1e24 100644
--- a/internal/distro/rhel9/edge.go
+++ b/internal/distro/rhel9/edge.go
@@ -124,7 +124,7 @@ var (
 		bootISO:             true,
 		image:               edgeSimplifiedInstallerImage,
 		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"},
 		basePartitionTables: edgeBasePartitionTables,
 	}