From 114a8b051b437121be91a22720cf7a791e531abd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 23 Sep 2024 13:37:34 +0200 Subject: [PATCH] gen-manifests: use `archName` in mockDepsolve() This commit adds the architecture to the faked packageset that is generated via mockDepsolve() to ensure we catch cross-arch manifest differences. --- cmd/gen-manifests/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/gen-manifests/main.go b/cmd/gen-manifests/main.go index 24a6d2793..687f2bbbe 100644 --- a/cmd/gen-manifests/main.go +++ b/cmd/gen-manifests/main.go @@ -226,7 +226,7 @@ func makeManifestJob( return } } else { - packageSpecs, repoConfigs = mockDepsolve(manifest.GetPackageSetChains(), repos) + packageSpecs, repoConfigs = mockDepsolve(manifest.GetPackageSetChains(), repos, archName) } _ = repoConfigs @@ -369,7 +369,7 @@ func depsolve(cacheDir string, packageSets map[string][]rpmmd.PackageSet, d dist return depsolvedSets, repoSets, nil } -func mockDepsolve(packageSets map[string][]rpmmd.PackageSet, repos []rpmmd.RepoConfig) (map[string][]rpmmd.PackageSpec, map[string][]rpmmd.RepoConfig) { +func mockDepsolve(packageSets map[string][]rpmmd.PackageSet, repos []rpmmd.RepoConfig, archName string) (map[string][]rpmmd.PackageSpec, map[string][]rpmmd.RepoConfig) { depsolvedSets := make(map[string][]rpmmd.PackageSpec) repoSets := make(map[string][]rpmmd.RepoConfig) for name, pkgSetChain := range packageSets { @@ -386,7 +386,7 @@ func mockDepsolve(packageSets map[string][]rpmmd.PackageSet, repos []rpmmd.RepoC Epoch: 0, Version: ver, Release: rel + ".fk1", - Arch: "noarch", + Arch: archName, RemoteLocation: fmt.Sprintf("https://example.com/repo/packages/%s", pkgName), Checksum: "sha256:" + checksum, }