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

cloudapi/v2: introduce compose status

Browse source 
In addition to individual image status, have an
overall status that captures success or failure
of the compose as a whole.

This is not as fine grained, and only distinguishes
between "pending", "failure" and "success".

This captures other jobs than the image builds, which
is relevant for the koji composes, which consists also
of koji-init and koji-finalize, in addition to the build
jobs.
This commit is contained in:
Tom Gundersen 2022-01-25 21:37:47 +00:00
parent c892ccfde0
commit c1dc9d7284
4 changed files with 151 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

24
internal/cloudapi/v2/v2_test.go
View file

@ -315,7 +315,8 @@ func TestComposeStatusSuccess(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "building"}
"image_status": {"status": "building"},
"status": "pending"
}`, jobId, jobId))
res, err := json.Marshal(&worker.OSBuildJobResult{
@ -330,7 +331,8 @@ func TestComposeStatusSuccess(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "success"}
"image_status": {"status": "success"},
"status": "success"
}`, jobId, jobId))
test.TestRoute(t, srv.Handler("/api/image-builder-composer/v2"), false, "GET", fmt.Sprintf("/api/image-builder-composer/v2/composes/%v/metadata", jobId), ``, http.StatusInternalServerError, `
@ -379,7 +381,8 @@ func TestComposeStatusFailure(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "building"}
"image_status": {"status": "building"},
"status": "pending"
}`, jobId, jobId))
err = wrksrv.FinishJob(token, nil)
@ -389,7 +392,8 @@ func TestComposeStatusFailure(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "failure"}
"image_status": {"status": "failure"},
"status": "failure"
}`, jobId, jobId))
}
@ -429,7 +433,8 @@ func TestComposeLegacyError(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "building"}
"image_status": {"status": "building"},
"status": "pending"
}`, jobId, jobId))
jobResult, err := json.Marshal(worker.OSBuildJobResult{TargetErrors: []string{"Osbuild failed"}})
@ -442,7 +447,8 @@ func TestComposeLegacyError(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "failure"}
"image_status": {"status": "failure"},
"status": "failure"
}`, jobId, jobId))
}
@ -482,7 +488,8 @@ func TestComposeJobError(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "building"}
"image_status": {"status": "building"},
"status": "pending"
}`, jobId, jobId))
jobErr := worker.JobResult{
@ -498,7 +505,8 @@ func TestComposeJobError(t *testing.T) {
"href": "/api/image-builder-composer/v2/composes/%v",
"kind": "ComposeStatus",
"id": "%v",
"image_status": {"status": "failure"}
"image_status": {"status": "failure"},
"status": "failure"
}`, jobId, jobId))
}