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

gen-manifests: do not return workerName from makeManifestJob

Browse source 
The value doesn't represent the worker name, just the top-level cache
directory for a job.  It's useful for separating caches and making the
generation faster, but it's not necessary to return from the function.
This commit is contained in:
Achilleas Koutsou 2022-05-30 16:06:56 +02:00 • committed by Tom Gundersen
parent d3dc4eba39
commit 8b4607c94f
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,14 +92,13 @@ 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, string) { func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, distribution distro.Distro, archName string, seedArg int64, path 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)
} }
filename := fmt.Sprintf("%s-%s-%s-boot.json", u(distroName), u(archName), u(name)) filename := fmt.Sprintf("%s-%s-%s-boot.json", u(distroName), u(archName), u(name))
workerName := archName + distribution.Name() cacheDir := filepath.Join("/tmp", "rpmmd", archName+distribution.Name())
cacheDir := filepath.Join("/tmp", "rpmmd", workerName)
options := distro.ImageOptions{Size: 0} options := distro.ImageOptions{Size: 0}
if cr.OSTree != nil { if cr.OSTree != nil {
@ -144,7 +143,7 @@ func makeManifestJob(name string, imgType distro.ImageType, cr composeRequest, d
} }
return save(manifest, packageSpecs, request, path, filename) return save(manifest, packageSpecs, request, path, filename)
} }
return job, workerName return job
} }
type DistroArchRepoMap map[string]map[string][]repository type DistroArchRepoMap map[string]map[string][]repository
@ -362,7 +361,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)
jobs = append(jobs, job) jobs = append(jobs, job)
} }
} }