distro: attach payload repositories to workload package sets

The merging of payload repositories into the os pipeline had the
unwanted side effect of using the payload repos for the first depsolve
in the os chain when instead they should only be used for the second
(the depsolve for the blueprint or workload packages).  This wasn't an
issue before because we didn't do the merging in the PackageSets()
function, but now we rely on the Manifest() function for that
functionality instead.

Before the merging of the two functions, the PackageSets() function did
not merge repositories and the repository-to-package-set mapping was
maintained correctly, but the merging was needed in the Manifest()
function so that rpm stage options were generated for all repositories.
With this change, we are removing the merging so that the mapping is
maintained, and will fix the rpm stage option generation in the pipeline
generator.

internal/distro/fedora/imagetype.go

@@ -31,6 +31,7 @@ type imageType struct {
 	arch               *architecture
 	platform           platform.Platform
 	environment        environment.Environment
+	workload           workload.Workload
 	name               string
 	nameAliases        []string
 	filename           string
@@ -272,11 +273,15 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		staticPackageSets[name] = getter(t)
 	}
 
-	// amend with repository information
+	// amend with repository information and collect payload repos
+	payloadRepos := make([]rpmmd.RepoConfig, 0)
 	for _, repo := range repos {
 		if len(repo.PackageSets) > 0 {
 			// only apply the repo to the listed package sets
 			for _, psName := range repo.PackageSets {
+				if slices.Contains(t.PayloadPackageSets(), psName) {
+					payloadRepos = append(payloadRepos, repo)
+				}
 				ps := staticPackageSets[psName]
 				ps.Repositories = append(ps.Repositories, repo)
 				staticPackageSets[psName] = ps
@@ -284,41 +289,24 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		}
 	}
 
-	// the os pipeline filters repos based on the `osPkgsKey` package set, merge the repos which
-	// contain a payload package set into the `osPkgsKey`, so those repos are included when
-	// building the rpm stage in the os pipeline
-	// TODO: roll this into workloads
-	mergedRepos := make([]rpmmd.RepoConfig, 0, len(repos))
-	for _, repo := range repos {
-		for _, pkgsKey := range t.PayloadPackageSets() {
-			// If the repo already contains the osPkgsKey, skip
-			if slices.Contains(repo.PackageSets, osPkgsKey) {
-				break
-			}
-			if slices.Contains(repo.PackageSets, pkgsKey) {
-				repo.PackageSets = append(repo.PackageSets, osPkgsKey)
-			}
-		}
-		mergedRepos = append(mergedRepos, repo)
-	}
-	repos = mergedRepos
-
 	warnings, err := t.checkOptions(bp, options)
 	if err != nil {
 		return nil, nil, err
 	}
 
-	// TODO: let image types specify valid workloads, rather than
-	// always assume Custom.
-	w := &workload.Custom{
-		BaseWorkload: workload.BaseWorkload{
-			Repos: staticPackageSets[blueprintPkgsKey].Repositories,
-		},
-		Packages: bp.GetPackagesEx(false),
-	}
-	if services := bp.Customizations.GetServices(); services != nil {
-		w.Services = services.Enabled
-		w.DisabledServices = services.Disabled
+	w := t.workload
+	if w == nil {
+		cw := &workload.Custom{
+			BaseWorkload: workload.BaseWorkload{
+				Repos: payloadRepos,
+			},
+			Packages: bp.GetPackagesEx(false),
+		}
+		if services := bp.Customizations.GetServices(); services != nil {
+			cw.Services = services.Enabled
+			cw.DisabledServices = services.Disabled
+		}
+		w = cw
 	}
 
 	source := rand.NewSource(seed)

internal/distro/rhel7/imagetype.go

@@ -164,11 +164,15 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		staticPackageSets[name] = getter(t)
 	}
 
-	// amend with repository information
+	// amend with repository information and collect payload repos
+	payloadRepos := make([]rpmmd.RepoConfig, 0)
 	for _, repo := range repos {
 		if len(repo.PackageSets) > 0 {
 			// only apply the repo to the listed package sets
 			for _, psName := range repo.PackageSets {
+				if slices.Contains(t.PayloadPackageSets(), psName) {
+					payloadRepos = append(payloadRepos, repo)
+				}
 				ps := staticPackageSets[psName]
 				ps.Repositories = append(ps.Repositories, repo)
 				staticPackageSets[psName] = ps
@@ -176,25 +180,6 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		}
 	}
 
-	// the os pipeline filters repos based on the `osPkgsKey` package set, merge the repos which
-	// contain a payload package set into the `osPkgsKey`, so those repos are included when
-	// building the rpm stage in the os pipeline
-	// TODO: roll this into workloads
-	mergedRepos := make([]rpmmd.RepoConfig, 0, len(repos))
-	for _, repo := range repos {
-		for _, pkgsKey := range t.PayloadPackageSets() {
-			// If the repo already contains the osPkgsKey, skip
-			if slices.Contains(repo.PackageSets, osPkgsKey) {
-				break
-			}
-			if slices.Contains(repo.PackageSets, pkgsKey) {
-				repo.PackageSets = append(repo.PackageSets, osPkgsKey)
-			}
-		}
-		mergedRepos = append(mergedRepos, repo)
-	}
-	repos = mergedRepos
-
 	warnings, err := t.checkOptions(bp, options)
 	if err != nil {
 		return nil, nil, err
@@ -204,7 +189,7 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 	if w == nil {
 		cw := &workload.Custom{
 			BaseWorkload: workload.BaseWorkload{
-				Repos: staticPackageSets[blueprintPkgsKey].Repositories,
+				Repos: payloadRepos,
 			},
 			Packages: bp.GetPackagesEx(false),
 		}

internal/distro/rhel8/imagetype.go

@@ -198,11 +198,15 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		staticPackageSets[name] = getter(t)
 	}
 
-	// amend with repository information
+	// amend with repository information and collect payload repos
+	payloadRepos := make([]rpmmd.RepoConfig, 0)
 	for _, repo := range repos {
 		if len(repo.PackageSets) > 0 {
 			// only apply the repo to the listed package sets
 			for _, psName := range repo.PackageSets {
+				if slices.Contains(t.PayloadPackageSets(), psName) {
+					payloadRepos = append(payloadRepos, repo)
+				}
 				ps := staticPackageSets[psName]
 				ps.Repositories = append(ps.Repositories, repo)
 				staticPackageSets[psName] = ps
@@ -210,25 +214,6 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		}
 	}
 
-	// the os pipeline filters repos based on the `osPkgsKey` package set, merge the repos which
-	// contain a payload package set into the `osPkgsKey`, so those repos are included when
-	// building the rpm stage in the os pipeline
-	// TODO: roll this into workloads
-	mergedRepos := make([]rpmmd.RepoConfig, 0, len(repos))
-	for _, repo := range repos {
-		for _, pkgsKey := range t.PayloadPackageSets() {
-			// If the repo already contains the osPkgsKey, skip
-			if slices.Contains(repo.PackageSets, osPkgsKey) {
-				break
-			}
-			if slices.Contains(repo.PackageSets, pkgsKey) {
-				repo.PackageSets = append(repo.PackageSets, osPkgsKey)
-			}
-		}
-		mergedRepos = append(mergedRepos, repo)
-	}
-	repos = mergedRepos
-
 	warnings, err := t.checkOptions(bp, options)
 	if err != nil {
 		return nil, nil, err
@@ -238,7 +223,7 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 	if w == nil {
 		cw := &workload.Custom{
 			BaseWorkload: workload.BaseWorkload{
-				Repos: staticPackageSets[blueprintPkgsKey].Repositories,
+				Repos: payloadRepos,
 			},
 			Packages: bp.GetPackagesEx(false),
 		}

internal/distro/rhel9/imagetype.go

@@ -201,11 +201,15 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		staticPackageSets[name] = getter(t)
 	}
 
-	// amend with repository information
+	// amend with repository information and collect payload repos
+	payloadRepos := make([]rpmmd.RepoConfig, 0)
 	for _, repo := range repos {
 		if len(repo.PackageSets) > 0 {
 			// only apply the repo to the listed package sets
 			for _, psName := range repo.PackageSets {
+				if slices.Contains(t.PayloadPackageSets(), psName) {
+					payloadRepos = append(payloadRepos, repo)
+				}
 				ps := staticPackageSets[psName]
 				ps.Repositories = append(ps.Repositories, repo)
 				staticPackageSets[psName] = ps
@@ -213,25 +217,6 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 		}
 	}
 
-	// the os pipeline filters repos based on the `osPkgsKey` package set, merge the repos which
-	// contain a payload package set into the `osPkgsKey`, so those repos are included when
-	// building the rpm stage in the os pipeline
-	// TODO: roll this into workloads
-	mergedRepos := make([]rpmmd.RepoConfig, 0, len(repos))
-	for _, repo := range repos {
-		for _, pkgsKey := range t.PayloadPackageSets() {
-			// If the repo already contains the osPkgsKey, skip
-			if slices.Contains(repo.PackageSets, osPkgsKey) {
-				break
-			}
-			if slices.Contains(repo.PackageSets, pkgsKey) {
-				repo.PackageSets = append(repo.PackageSets, osPkgsKey)
-			}
-		}
-		mergedRepos = append(mergedRepos, repo)
-	}
-
-	repos = mergedRepos
 	warnings, err := t.checkOptions(bp, options)
 	if err != nil {
 		return nil, nil, err
@@ -241,7 +226,7 @@ func (t *imageType) Manifest(bp *blueprint.Blueprint,
 	if w == nil {
 		cw := &workload.Custom{
 			BaseWorkload: workload.BaseWorkload{
-				Repos: staticPackageSets[blueprintPkgsKey].Repositories,
+				Repos: payloadRepos,
 			},
 			Packages: bp.GetPackagesEx(false),
 		}