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

cloudapi: add build job dependency checks

Browse source 
If an osbuild or koji-osbuild job has failed, add
a check to see if it is a result of the build jobs
dependencies and return the dependency failure job
error furthest up the chain of errors & add this
error to the details filed of the build job error.
This commit is contained in:
Gianluca Zuccarelli 2022-04-08 14:44:13 +01:00 • committed by Sanne Raymaekers
parent 596464e8a2
commit e31fb36d65
3 changed files with 30 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

32
internal/worker/server.go
View file

@ -138,7 +138,6 @@ func (s *Server) enqueue(jobType string, job interface{}, dependencies []uuid.UU
}
func (s *Server) CheckBuildDependencies(dep uuid.UUID, jobErr *clienterrors.Error) error {
var depErrs []clienterrors.Error
var manifestJR ManifestJobByIDResult
_, deps, err := s.ManifestJobStatus(dep, &manifestJR)
if err != nil {
@ -146,28 +145,23 @@ func (s *Server) CheckBuildDependencies(dep uuid.UUID, jobErr *clienterrors.Erro
}
if manifestJobErr := manifestJR.JobError; manifestJobErr != nil {
if manifestJobErr.HasDependencyError() && len(deps) > 0 {
if len(deps) > 1 {
return fmt.Errorf("Unexpected number of dependencies received")
}
var depsolveJR DepsolveJobResult
_, _, err := s.DepsolveJobStatus(deps[0], &depsolveJR)
if err != nil {
return err
}
if depJobErr := depsolveJR.JobError; depJobErr != nil {
depErrs = append(depErrs, *depJobErr)
}
if !manifestJobErr.HasDependencyError() {
jobErr.Details = manifestJobErr
return nil
}
if len(deps) > 1 {
return fmt.Errorf("Unexpected number of dependencies received")
}
depErrs = append(depErrs, *manifestJobErr)
var depsolveJR DepsolveJobResult
_, _, err := s.DepsolveJobStatus(deps[0], &depsolveJR)
if err != nil {
return err
}
jobErr.Details = depsolveJR.JobError
}
jobErr.Details = clienterrors.ErrorDetails{
FailedDependencies: depErrs,
}
return nil
}