synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-08 11:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

add tests for prebuilds

Browse Source 
finalise database integration tests for prebuilds

reintegrate with danny's latest changes

add back assertions for deletion integration tests of prebuilds

tidy up prebuilds tests
This commit is contained in:
Sas Swart
2025-03-03 18:43:27 +00:00
parent e261aee191
commit e1df5368a5
5 changed files with 309 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coderd/database/queries.sql.go
View File

@ -5800,9 +5800,8 @@ FROM workspace_latest_build wlb
INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id
INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id
INNER JOIN templates t ON t.active_version_id = wlb.template_version_id
WHERE pj.job_status NOT IN -- Jobs that are not in terminal states.
('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status,
'failed'::provisioner_job_status)
WHERE wlb.transition = 'start'::workspace_transition
AND pj.job_status IN ('pending'::provisioner_job_status, 'running'::provisioner_job_status)
GROUP BY t.id, wpb.template_version_id, wpb.transition
`
@ -5861,8 +5860,7 @@ FROM workspace_prebuilds p
ON tvp_curr.id = p.current_preset_id -- See https://github.com/coder/internal/issues/398.
WHERE (b.transition = 'start'::workspace_transition
-- Jobs that are not in terminal states.
AND pj.job_status NOT IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status,
'unknown'::provisioner_job_status))
AND pj.job_status = 'succeeded'::provisioner_job_status)
`
type GetRunningPrebuildsRow struct {

7
coderd/database/queries/prebuilds.sql
View File

@ -18,8 +18,7 @@ FROM workspace_prebuilds p
ON tvp_curr.id = p.current_preset_id -- See https://github.com/coder/internal/issues/398.
WHERE (b.transition = 'start'::workspace_transition
-- Jobs that are not in terminal states.
AND pj.job_status NOT IN ('failed'::provisioner_job_status, 'canceled'::provisioner_job_status,
'unknown'::provisioner_job_status));
AND pj.job_status = 'succeeded'::provisioner_job_status);
-- name: GetTemplatePresetsWithPrebuilds :many
SELECT t.id AS template_id,
@ -42,9 +41,7 @@ FROM workspace_latest_build wlb
INNER JOIN provisioner_jobs pj ON wlb.job_id = pj.id
INNER JOIN workspace_prebuild_builds wpb ON wpb.id = wlb.id
INNER JOIN templates t ON t.active_version_id = wlb.template_version_id
WHERE pj.job_status NOT IN -- Jobs that are not in terminal states.
('succeeded'::provisioner_job_status, 'canceled'::provisioner_job_status,
'failed'::provisioner_job_status)
WHERE pj.job_status IN ('pending'::provisioner_job_status, 'running'::provisioner_job_status)
GROUP BY t.id, wpb.template_version_id, wpb.transition;
-- name: ClaimPrebuild :one