BlueGit

timfa bluegit

fix: sla latere stages over na een harde mislukking

Een job zonder allow_failure zette de pipeline meteen op failed terwijl
latere jobs nog queued stonden. De runner bezocht die pipeline daarna
niet meer, dus de volgende stage bleef pending. Die jobs worden nu
eerst overgeslagen, en de status blijft running tot de wachtrij leeg is.

De editor zegt bij één treffer "1 issue" in plaats van "1 issues".

Co-authored-by: tim <tim@timfalken.com>

timfa project_87923614_bot_3aff574f6f98414b945a8799374f9092 · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
ceb7aa197c6544e8d4bdcc877d03165905062f43
Parent
b3d1a25f
7 files changed +181 −6
internal/i18n/catalog.go +2 −0
@@ -201,7 +201,9 @@ var en = map[string]string{
201 201 "edit.title": "Pipeline Editor",
202 202 "edit.clean": "No issues found",
203 203 "edit.issues": "%d issues",
204 "edit.issueOne": "%d issue",
204 205 "edit.warnings": "%d warnings",
206 "edit.warningOne": "%d warning",
205 207 "edit.message": "Commit message",
206 208 "edit.branch": "Branch",
207 209 "edit.save": "Commit",
@@ -201,7 +201,9 @@ var en = map[string]string{
201 "edit.title": "Pipeline Editor",
201 "edit.title": "Pipeline Editor",
202 "edit.clean": "No issues found",
202 "edit.clean": "No issues found",
203 "edit.issues": "%d issues",
203 "edit.issues": "%d issues",
204 "edit.issueOne": "%d issue",
204 "edit.warnings": "%d warnings",
205 "edit.warnings": "%d warnings",
206 "edit.warningOne": "%d warning",
205 "edit.message": "Commit message",
207 "edit.message": "Commit message",
206 "edit.branch": "Branch",
208 "edit.branch": "Branch",
207 "edit.save": "Commit",
209 "edit.save": "Commit",
internal/i18n/catalog_lang.go +6 −0
@@ -207,7 +207,9 @@ var nl = map[string]string{
207 207 "edit.title": "Pipeline-editor",
208 208 "edit.clean": "Geen problemen gevonden",
209 209 "edit.issues": "%d fouten",
210 "edit.issueOne": "%d fout",
210 211 "edit.warnings": "%d waarschuwingen",
212 "edit.warningOne": "%d waarschuwing",
211 213 "edit.message": "Commitbericht",
212 214 "edit.branch": "Branch",
213 215 "edit.save": "Commit",
@@ -726,7 +728,9 @@ var de = map[string]string{
726 728 "edit.title": "Pipeline-Editor",
727 729 "edit.clean": "Keine Probleme gefunden",
728 730 "edit.issues": "%d Probleme",
731 "edit.issueOne": "%d Problem",
729 732 "edit.warnings": "%d Warnungen",
733 "edit.warningOne": "%d Warnung",
730 734 "edit.message": "Commit-Nachricht",
731 735 "edit.branch": "Branch",
732 736 "edit.save": "Committen",
@@ -1245,7 +1249,9 @@ var fr = map[string]string{
1245 1249 "edit.title": "Éditeur de pipeline",
1246 1250 "edit.clean": "Aucun problème",
1247 1251 "edit.issues": "%d problèmes",
1252 "edit.issueOne": "%d problème",
1248 1253 "edit.warnings": "%d avertissements",
1254 "edit.warningOne": "%d avertissement",
1249 1255 "edit.message": "Message de commit",
1250 1256 "edit.branch": "Branche",
1251 1257 "edit.save": "Commiter",
@@ -207,7 +207,9 @@ var nl = map[string]string{
207 "edit.title": "Pipeline-editor",
207 "edit.title": "Pipeline-editor",
208 "edit.clean": "Geen problemen gevonden",
208 "edit.clean": "Geen problemen gevonden",
209 "edit.issues": "%d fouten",
209 "edit.issues": "%d fouten",
210 "edit.issueOne": "%d fout",
210 "edit.warnings": "%d waarschuwingen",
211 "edit.warnings": "%d waarschuwingen",
212 "edit.warningOne": "%d waarschuwing",
211 "edit.message": "Commitbericht",
213 "edit.message": "Commitbericht",
212 "edit.branch": "Branch",
214 "edit.branch": "Branch",
213 "edit.save": "Commit",
215 "edit.save": "Commit",
@@ -726,7 +728,9 @@ var de = map[string]string{
726 "edit.title": "Pipeline-Editor",
728 "edit.title": "Pipeline-Editor",
727 "edit.clean": "Keine Probleme gefunden",
729 "edit.clean": "Keine Probleme gefunden",
728 "edit.issues": "%d Probleme",
730 "edit.issues": "%d Probleme",
731 "edit.issueOne": "%d Problem",
729 "edit.warnings": "%d Warnungen",
732 "edit.warnings": "%d Warnungen",
733 "edit.warningOne": "%d Warnung",
730 "edit.message": "Commit-Nachricht",
734 "edit.message": "Commit-Nachricht",
731 "edit.branch": "Branch",
735 "edit.branch": "Branch",
732 "edit.save": "Committen",
736 "edit.save": "Committen",
@@ -1245,7 +1249,9 @@ var fr = map[string]string{
1245 "edit.title": "Éditeur de pipeline",
1249 "edit.title": "Éditeur de pipeline",
1246 "edit.clean": "Aucun problème",
1250 "edit.clean": "Aucun problème",
1247 "edit.issues": "%d problèmes",
1251 "edit.issues": "%d problèmes",
1252 "edit.issueOne": "%d problème",
1248 "edit.warnings": "%d avertissements",
1253 "edit.warnings": "%d avertissements",
1254 "edit.warningOne": "%d avertissement",
1249 "edit.message": "Message de commit",
1255 "edit.message": "Message de commit",
1250 "edit.branch": "Branche",
1256 "edit.branch": "Branche",
1251 "edit.save": "Commiter",
1257 "edit.save": "Commiter",
internal/runner/runner.go +47 −0
@@ -84,6 +84,7 @@ func (r *Runner) Tick(ctx context.Context) {
84 84 }
85 85
86 86 func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
87 r.settle(ctx, p.ID)
87 88 jobs, err := r.Store.JobsByPipeline(ctx, p.ID)
88 89 if err != nil {
89 90 r.Log.Error("jobs", "err", err)
@@ -125,6 +126,51 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
125 126 }
126 127 }
127 128
129 // settle slaat jobs over die door een harde mislukking niet meer hoeven.
130 // Dat gebeurt meteen, ook als de pipelinestatus al op failed was gezet.
131 func (r *Runner) settle(ctx context.Context, pipelineID int64) {
132 for {
133 jobs, err := r.Store.JobsByPipeline(ctx, pipelineID)
134 if err != nil {
135 if r.Log != nil {
136 r.Log.Error("jobs", "err", err)
137 }
138 return
139 }
140 specs := make([]ci.Job, len(jobs))
141 status := map[string]string{}
142 for i, j := range jobs {
143 specs[i] = ci.Job{Name: j.Name, Stage: j.Stage, Needs: j.Needs, Optional: j.Optional, NeedsSet: j.NeedsSet, AllowFailure: j.AllowFailure, When: j.When}
144 status[j.Name] = j.Status
145 }
146 moved := false
147 for _, j := range jobs {
148 if j.Status != "queued" && j.Status != "manual" {
149 continue
150 }
151 switch ci.Gate(specs, status, specs[indexOf(jobs, j.Name)]) {
152 case "skip":
153 if err := r.Store.SkipJob(ctx, j.ID, "skipped because an earlier job failed\n"); err != nil && r.Log != nil {
154 r.Log.Error("skip", "err", err)
155 continue
156 }
157 status[j.Name] = "skipped"
158 moved = true
159 case "fail":
160 if err := r.Store.FinishJob(ctx, j.ID, "failed", "a required job is not part of this pipeline\n"); err != nil && r.Log != nil {
161 r.Log.Error("fail", "err", err)
162 continue
163 }
164 status[j.Name] = "failed"
165 moved = true
166 }
167 }
168 if !moved {
169 return
170 }
171 }
172 }
173
128 174 func indexOf(jobs []store.Job, name string) int {
129 175 for i, j := range jobs {
130 176 if j.Name == name {
@@ -150,6 +196,7 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
150 196 if ferr := r.Store.FinishJob(context.Background(), job.ID, status, extra); ferr != nil {
151 197 r.Log.Error("job afronden", "err", ferr)
152 198 }
199 r.settle(context.Background(), p.ID)
153 200 final, rerr := r.Store.RefreshPipelineStatus(context.Background(), p.ID)
154 201 if rerr != nil {
155 202 r.Log.Error("pipelinestatus", "err", rerr)
@@ -84,6 +84,7 @@ func (r *Runner) Tick(ctx context.Context) {
84}
84}
85
85
86func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
86func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
87 r.settle(ctx, p.ID)
87 jobs, err := r.Store.JobsByPipeline(ctx, p.ID)
88 jobs, err := r.Store.JobsByPipeline(ctx, p.ID)
88 if err != nil {
89 if err != nil {
89 r.Log.Error("jobs", "err", err)
90 r.Log.Error("jobs", "err", err)
@@ -125,6 +126,51 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
125 }
126 }
126}
127}
127
128
129// settle slaat jobs over die door een harde mislukking niet meer hoeven.
130// Dat gebeurt meteen, ook als de pipelinestatus al op failed was gezet.
131func (r *Runner) settle(ctx context.Context, pipelineID int64) {
132 for {
133 jobs, err := r.Store.JobsByPipeline(ctx, pipelineID)
134 if err != nil {
135 if r.Log != nil {
136 r.Log.Error("jobs", "err", err)
137 }
138 return
139 }
140 specs := make([]ci.Job, len(jobs))
141 status := map[string]string{}
142 for i, j := range jobs {
143 specs[i] = ci.Job{Name: j.Name, Stage: j.Stage, Needs: j.Needs, Optional: j.Optional, NeedsSet: j.NeedsSet, AllowFailure: j.AllowFailure, When: j.When}
144 status[j.Name] = j.Status
145 }
146 moved := false
147 for _, j := range jobs {
148 if j.Status != "queued" && j.Status != "manual" {
149 continue
150 }
151 switch ci.Gate(specs, status, specs[indexOf(jobs, j.Name)]) {
152 case "skip":
153 if err := r.Store.SkipJob(ctx, j.ID, "skipped because an earlier job failed\n"); err != nil && r.Log != nil {
154 r.Log.Error("skip", "err", err)
155 continue
156 }
157 status[j.Name] = "skipped"
158 moved = true
159 case "fail":
160 if err := r.Store.FinishJob(ctx, j.ID, "failed", "a required job is not part of this pipeline\n"); err != nil && r.Log != nil {
161 r.Log.Error("fail", "err", err)
162 continue
163 }
164 status[j.Name] = "failed"
165 moved = true
166 }
167 }
168 if !moved {
169 return
170 }
171 }
172}
173
128func indexOf(jobs []store.Job, name string) int {
174func indexOf(jobs []store.Job, name string) int {
129 for i, j := range jobs {
175 for i, j := range jobs {
130 if j.Name == name {
176 if j.Name == name {
@@ -150,6 +196,7 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
150 if ferr := r.Store.FinishJob(context.Background(), job.ID, status, extra); ferr != nil {
196 if ferr := r.Store.FinishJob(context.Background(), job.ID, status, extra); ferr != nil {
151 r.Log.Error("job afronden", "err", ferr)
197 r.Log.Error("job afronden", "err", ferr)
152 }
198 }
199 r.settle(context.Background(), p.ID)
153 final, rerr := r.Store.RefreshPipelineStatus(context.Background(), p.ID)
200 final, rerr := r.Store.RefreshPipelineStatus(context.Background(), p.ID)
154 if rerr != nil {
201 if rerr != nil {
155 r.Log.Error("pipelinestatus", "err", rerr)
202 r.Log.Error("pipelinestatus", "err", rerr)
internal/runner/settle_test.go added +58 −0
@@ -0,0 +1,58 @@
1 package runner
2
3 import (
4 "context"
5 "path/filepath"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/store"
9 )
10
11 func TestSettleSkipsLaterStageButNotAllowFailure(t *testing.T) {
12 key := make([]byte, 32)
13 st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), key)
14 if err != nil {
15 t.Fatal(err)
16 }
17 t.Cleanup(func() { _ = st.Close() })
18 ctx := context.Background()
19 tim, err := st.UpsertUser(ctx, 1, "tim", "", false)
20 if err != nil {
21 t.Fatal(err)
22 }
23 repo, err := st.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
24 if err != nil {
25 t.Fatal(err)
26 }
27 id, err := st.CreatePipeline(ctx, repo.ID, "abc", "refs/heads/master", "push", "tim", "fail", []store.NewJob{
28 {Name: "hard", Stage: "test", Script: "exit 1"},
29 {Name: "soft", Stage: "test", Script: "exit 1", AllowFailure: true},
30 {Name: "later", Stage: "deploy", Script: "exit 0"},
31 {Name: "anyway", Stage: "deploy", Script: "exit 0", When: "always"},
32 })
33 if err != nil {
34 t.Fatal(err)
35 }
36 jobs, _ := st.JobsByPipeline(ctx, id)
37 for _, j := range jobs {
38 if j.Name == "hard" || j.Name == "soft" {
39 if err := st.FinishJob(ctx, j.ID, "failed", ""); err != nil {
40 t.Fatal(err)
41 }
42 }
43 }
44 rn := &Runner{Store: st, Storage: t.TempDir()}
45 rn.settle(ctx, id)
46 got := map[string]string{}
47 jobs, _ = st.JobsByPipeline(ctx, id)
48 for _, j := range jobs {
49 got[j.Name] = j.Status
50 }
51 if got["later"] != "skipped" || got["anyway"] != "queued" || got["soft"] != "failed" {
52 t.Fatalf("status: %v", got)
53 }
54 status, err := st.RefreshPipelineStatus(ctx, id)
55 if err != nil || status != "running" {
56 t.Fatalf("always-job houdt de pipeline open: %s %v", status, err)
57 }
58 }
@@ -0,0 +1,58 @@
1package runner
2
3import (
4 "context"
5 "path/filepath"
6 "testing"
7
8 "gitlab.com/Timfa/bluegit/internal/store"
9)
10
11func TestSettleSkipsLaterStageButNotAllowFailure(t *testing.T) {
12 key := make([]byte, 32)
13 st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), key)
14 if err != nil {
15 t.Fatal(err)
16 }
17 t.Cleanup(func() { _ = st.Close() })
18 ctx := context.Background()
19 tim, err := st.UpsertUser(ctx, 1, "tim", "", false)
20 if err != nil {
21 t.Fatal(err)
22 }
23 repo, err := st.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
24 if err != nil {
25 t.Fatal(err)
26 }
27 id, err := st.CreatePipeline(ctx, repo.ID, "abc", "refs/heads/master", "push", "tim", "fail", []store.NewJob{
28 {Name: "hard", Stage: "test", Script: "exit 1"},
29 {Name: "soft", Stage: "test", Script: "exit 1", AllowFailure: true},
30 {Name: "later", Stage: "deploy", Script: "exit 0"},
31 {Name: "anyway", Stage: "deploy", Script: "exit 0", When: "always"},
32 })
33 if err != nil {
34 t.Fatal(err)
35 }
36 jobs, _ := st.JobsByPipeline(ctx, id)
37 for _, j := range jobs {
38 if j.Name == "hard" || j.Name == "soft" {
39 if err := st.FinishJob(ctx, j.ID, "failed", ""); err != nil {
40 t.Fatal(err)
41 }
42 }
43 }
44 rn := &Runner{Store: st, Storage: t.TempDir()}
45 rn.settle(ctx, id)
46 got := map[string]string{}
47 jobs, _ = st.JobsByPipeline(ctx, id)
48 for _, j := range jobs {
49 got[j.Name] = j.Status
50 }
51 if got["later"] != "skipped" || got["anyway"] != "queued" || got["soft"] != "failed" {
52 t.Fatalf("status: %v", got)
53 }
54 status, err := st.RefreshPipelineStatus(ctx, id)
55 if err != nil || status != "running" {
56 t.Fatalf("always-job houdt de pipeline open: %s %v", status, err)
57 }
58}
internal/server/editor.go +10 −2
@@ -188,9 +188,17 @@ func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) (
188 188 }
189 189 status, class := s.tr(r, "edit.clean"), "passed"
190 190 if errors > 0 {
191 status, class = s.tr(r, "edit.issues", errors), "failed"
191 key := "edit.issues"
192 if errors == 1 {
193 key = "edit.issueOne"
194 }
195 status, class = s.tr(r, key, errors), "failed"
192 196 } else if warnings > 0 {
193 status, class = s.tr(r, "edit.warnings", warnings), "warning"
197 key := "edit.warnings"
198 if warnings == 1 {
199 key = "edit.warningOne"
200 }
201 status, class = s.tr(r, key, warnings), "warning"
194 202 }
195 203 if rows == nil {
196 204 rows = []LintRow{}
@@ -188,9 +188,17 @@ func (s *Server) ciEditorModel(r *http.Request, body string, read func(string) (
188 }
188 }
189 status, class := s.tr(r, "edit.clean"), "passed"
189 status, class := s.tr(r, "edit.clean"), "passed"
190 if errors > 0 {
190 if errors > 0 {
191 status, class = s.tr(r, "edit.issues", errors), "failed"
191 key := "edit.issues"
192 if errors == 1 {
193 key = "edit.issueOne"
194 }
195 status, class = s.tr(r, key, errors), "failed"
192 } else if warnings > 0 {
196 } else if warnings > 0 {
193 status, class = s.tr(r, "edit.warnings", warnings), "warning"
197 key := "edit.warnings"
198 if warnings == 1 {
199 key = "edit.warningOne"
200 }
201 status, class = s.tr(r, key, warnings), "warning"
194 }
202 }
195 if rows == nil {
203 if rows == nil {
196 rows = []LintRow{}
204 rows = []LintRow{}
internal/store/flow.go +6 −4
@@ -469,7 +469,7 @@ func scanJob(rows *sql.Rows) (Job, error) {
469 469
470 470 // ActivePipelines zijn nog niet af.
471 471 func (s *Store) ActivePipelines(ctx context.Context) ([]Pipeline, error) {
472 rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE status IN ('queued', 'running', 'manual') ORDER BY id`)
472 rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE status IN ('queued', 'running', 'manual') OR id IN (SELECT pipeline_id FROM jobs WHERE status IN ('queued', 'running')) ORDER BY id`)
473 473 if err != nil {
474 474 return nil, err
475 475 }
@@ -532,11 +532,13 @@ func (s *Store) RefreshPipelineStatus(ctx context.Context, pipelineID int64) (st
532 532 }
533 533 }
534 534 switch {
535 case status == "failed":
536 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'failed', finished_at = ? WHERE id = ?`, now(), pipelineID)
537 535 case open:
536 // Een harde mislukking wint pas als er niets meer in de wachtrij of
537 // aan het werk is. Anders blijft de runner latere jobs overslaan.
538 538 status = "running"
539 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'running' WHERE id = ?`, pipelineID)
539 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'running', finished_at = NULL WHERE id = ?`, pipelineID)
540 case status == "failed":
541 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'failed', finished_at = ? WHERE id = ?`, now(), pipelineID)
540 542 case manual:
541 543 status = "manual"
542 544 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'manual', finished_at = NULL WHERE id = ?`, pipelineID)
@@ -469,7 +469,7 @@ func scanJob(rows *sql.Rows) (Job, error) {
469
469
470// ActivePipelines zijn nog niet af.
470// ActivePipelines zijn nog niet af.
471func (s *Store) ActivePipelines(ctx context.Context) ([]Pipeline, error) {
471func (s *Store) ActivePipelines(ctx context.Context) ([]Pipeline, error) {
472 rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE status IN ('queued', 'running', 'manual') ORDER BY id`)
472 rows, err := s.db.QueryContext(ctx, pipelineCols+` WHERE status IN ('queued', 'running', 'manual') OR id IN (SELECT pipeline_id FROM jobs WHERE status IN ('queued', 'running')) ORDER BY id`)
473 if err != nil {
473 if err != nil {
474 return nil, err
474 return nil, err
475 }
475 }
@@ -532,11 +532,13 @@ func (s *Store) RefreshPipelineStatus(ctx context.Context, pipelineID int64) (st
532 }
532 }
533 }
533 }
534 switch {
534 switch {
535 case status == "failed":
536 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'failed', finished_at = ? WHERE id = ?`, now(), pipelineID)
537 case open:
535 case open:
536 // Een harde mislukking wint pas als er niets meer in de wachtrij of
537 // aan het werk is. Anders blijft de runner latere jobs overslaan.
538 status = "running"
538 status = "running"
539 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'running' WHERE id = ?`, pipelineID)
539 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'running', finished_at = NULL WHERE id = ?`, pipelineID)
540 case status == "failed":
541 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'failed', finished_at = ? WHERE id = ?`, now(), pipelineID)
540 case manual:
542 case manual:
541 status = "manual"
543 status = "manual"
542 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'manual', finished_at = NULL WHERE id = ?`, pipelineID)
544 _, err = s.db.ExecContext(ctx, `UPDATE pipelines SET status = 'manual', finished_at = NULL WHERE id = ?`, pipelineID)
internal/store/pipeline_status_test.go added +52 −0
@@ -0,0 +1,52 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 )
7
8 func TestRefreshWaitsForQueuedJobs(t *testing.T) {
9 s := openTest(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 repo, err := s.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
16 if err != nil {
17 t.Fatal(err)
18 }
19 id, err := s.CreatePipeline(ctx, repo.ID, "abc", "refs/heads/master", "push", "tim", "fail", []NewJob{
20 {Name: "hard", Stage: "test", Script: "exit 1"},
21 {Name: "later", Stage: "deploy", Script: "exit 0"},
22 })
23 if err != nil {
24 t.Fatal(err)
25 }
26 jobs, err := s.JobsByPipeline(ctx, id)
27 if err != nil {
28 t.Fatal(err)
29 }
30 for _, j := range jobs {
31 if j.Name == "hard" {
32 if err := s.FinishJob(ctx, j.ID, "failed", ""); err != nil {
33 t.Fatal(err)
34 }
35 }
36 }
37 status, err := s.RefreshPipelineStatus(ctx, id)
38 if err != nil || status != "running" {
39 t.Fatalf("wachtrij hoort de pipeline open te houden: %s %v", status, err)
40 }
41 for _, j := range jobs {
42 if j.Name == "later" {
43 if err := s.SkipJob(ctx, j.ID, "skipped"); err != nil {
44 t.Fatal(err)
45 }
46 }
47 }
48 status, err = s.RefreshPipelineStatus(ctx, id)
49 if err != nil || status != "failed" {
50 t.Fatalf("na het overslaan: %s %v", status, err)
51 }
52 }
@@ -0,0 +1,52 @@
1package store
2
3import (
4 "context"
5 "testing"
6)
7
8func TestRefreshWaitsForQueuedJobs(t *testing.T) {
9 s := openTest(t)
10 ctx := context.Background()
11 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
12 if err != nil {
13 t.Fatal(err)
14 }
15 repo, err := s.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
16 if err != nil {
17 t.Fatal(err)
18 }
19 id, err := s.CreatePipeline(ctx, repo.ID, "abc", "refs/heads/master", "push", "tim", "fail", []NewJob{
20 {Name: "hard", Stage: "test", Script: "exit 1"},
21 {Name: "later", Stage: "deploy", Script: "exit 0"},
22 })
23 if err != nil {
24 t.Fatal(err)
25 }
26 jobs, err := s.JobsByPipeline(ctx, id)
27 if err != nil {
28 t.Fatal(err)
29 }
30 for _, j := range jobs {
31 if j.Name == "hard" {
32 if err := s.FinishJob(ctx, j.ID, "failed", ""); err != nil {
33 t.Fatal(err)
34 }
35 }
36 }
37 status, err := s.RefreshPipelineStatus(ctx, id)
38 if err != nil || status != "running" {
39 t.Fatalf("wachtrij hoort de pipeline open te houden: %s %v", status, err)
40 }
41 for _, j := range jobs {
42 if j.Name == "later" {
43 if err := s.SkipJob(ctx, j.ID, "skipped"); err != nil {
44 t.Fatal(err)
45 }
46 }
47 }
48 status, err = s.RefreshPipelineStatus(ctx, id)
49 if err != nil || status != "failed" {
50 t.Fatalf("na het overslaan: %s %v", status, err)
51 }
52}