worker: normalize Job.Run() return types

This commit is contained in:
Ondřej Budai 2020-02-04 11:04:20 +01:00 committed by Tom Gundersen
parent 0d4479bbcd
commit 8781d41da6
2 changed files with 33 additions and 23 deletions

View file

@ -90,19 +90,12 @@ func handleJob(client *ComposerClient) error {
}
fmt.Printf("Running job %s\n", job.ID.String())
image, result, err, errs := job.Run()
image, result, err := job.Run()
if err != nil {
log.Printf(" Job failed: %v", err)
return client.UpdateJob(job, "FAILED", nil, result)
}
for _, err := range errs {
if err != nil {
log.Printf(" Job target error: %v", err)
return client.UpdateJob(job, "FAILED", nil, result)
}
}
return client.UpdateJob(job, "FINISHED", image, result)
}