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

store: use Job.ImageBuildID to fetch image build

Browse source 
ImageBuildID is an index into Compose.ImageBuilds. Use that directly
instead of looping over ImageBuilds and matching on OutputType.
This commit is contained in:
Lars Karlitski 2020-03-23 10:37:30 +01:00
parent f386ae43dc
commit 25e926bc36
1 changed files with 3 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/store/store.go
View file

@ -676,23 +676,10 @@ func (s *Store) PopJob() Job {
if !exists {
panic("Invalid job in queue.")
}
// Loop over the image builds and find the right one according to the image type
// Change queue status to running for the image build as well as for the targets
for n, imageBuild := range compose.ImageBuilds {
imgTypeCompatStr, exists := imageBuild.ImageType.ToCompatString()
if !exists {
panic("fatal error, image type should exist but it does not")
}
if imgTypeCompatStr != job.ImageType {
continue
}
if imageBuild.QueueStatus != common.IBWaiting {
panic("Invalid job in queue.")
}
compose.ImageBuilds[n].QueueStatus = common.IBRunning
for m := range compose.ImageBuilds[n].Targets {
compose.ImageBuilds[n].Targets[m].Status = common.IBRunning
}
compose.ImageBuilds[job.ImageBuildID].QueueStatus = common.IBRunning
for m := range compose.ImageBuilds[job.ImageBuildID].Targets {
compose.ImageBuilds[job.ImageBuildID].Targets[m].Status = common.IBRunning
}
// Replace the compose struct with the new one
// TODO: I'm not sure this is needed, but I don't know what is the golang semantics in this case