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

gen-manifests: add flag for setting cache location

Browse source
This commit is contained in:
Achilleas Koutsou 2022-06-28 12:48:21 +02:00 • committed by Christian Kellner
parent 5ac0ef2f77
commit 8adb502aa0
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cmd/gen-manifests/main.go
View file

@ -24,8 +24,6 @@ import (
"github.com/osbuild/osbuild-composer/internal/rpmmd" "github.com/osbuild/osbuild-composer/internal/rpmmd"
) )
const cacheRoot = "/tmp/rpmmd"
type repository struct { type repository struct {
Name string `json:"name"` Name string `json:"name"`
BaseURL string `json:"baseurl,omitempty"` BaseURL string `json:"baseurl,omitempty"`
@ -94,7 +92,7 @@ func loadFormatRequestMap() formatRequestMap {
type manifestJob func(chan string) error type manifestJob func(chan string) error
func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, distribution distro.Distro, archName string, seedArg int64, path string) manifestJob { func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, distribution distro.Distro, archName string, seedArg int64, path string, cacheRoot string) manifestJob {
distroName := distribution.Name() distroName := distribution.Name()
u := func(s string) string { u := func(s string) string {
return strings.Replace(s, "-", "_", -1) return strings.Replace(s, "-", "_", -1)
@ -309,10 +307,12 @@ func mergeOverrides(base, overrides composeRequest) composeRequest {
func main() { func main() {
outputDirFlag := flag.String("output", "test/data/manifests.plain/", "") outputDirFlag := flag.String("output", "test/data/manifests.plain/", "")
nWorkersFlag := flag.Int("workers", 16, "") nWorkersFlag := flag.Int("workers", 16, "")
cacheRootFlag := flag.String("cache", "/tmp/rpmmd", "")
flag.Parse() flag.Parse()
outputDir := *outputDirFlag outputDir := *outputDirFlag
nWorkers := *nWorkersFlag nWorkers := *nWorkersFlag
cacheRoot := *cacheRootFlag
seedArg := int64(0) seedArg := int64(0)
darm := readRepos() darm := readRepos()
@ -363,7 +363,7 @@ func main() {
composeReq := req.ComposeRequest composeReq := req.ComposeRequest
composeReq.Repositories = filterRepos(repos, imgTypeName) composeReq.Repositories = filterRepos(repos, imgTypeName)
job := makeManifestJob(jobName, imgType, composeReq, distribution, archName, seedArg, outputDir) job := makeManifestJob(jobName, imgType, composeReq, distribution, archName, seedArg, outputDir, cacheRoot)
jobs = append(jobs, job) jobs = append(jobs, job)
} }
} }