BlueGit

timfa bluegit

Merge branch 'cursor/steve-needs-skip-65da' into 'master'

fix: sla een job over als een need faalt of is overgeslagen

See merge request Timfa/bluegit!37

timfa Tim Falken · pushed by timfa

Authored 2026-10-22 · 3 weeks ago

Hash
3bfdac8aae202fa5d944fd41fd598ff7cceceb68
4 files changed +230 −7
internal/ci/eval.go +18 −5
@@ -365,11 +365,17 @@ func globRegexp(pattern string) *regexp.Regexp {
365 365 // "ready" betekent dat alle voorgangers klaar zijn.
366 366 // "wait" betekent dat er nog een voorganger loopt of in de wachtrij staat.
367 367 // "skip" betekent dat een voorganger mislukte zonder allow_failure,
368 // of dat when: on_failure geen mislukking zag.
368 // dat een job in needs is overgeslagen, of dat when: on_failure geen
369 // mislukking zag.
369 370 // "fail" betekent dat een verplichte need niet in deze pipeline zit.
370 371 //
371 // NeedsSet volgt de genoemde jobs, ook als de lijst leeg is.
372 // Zonder needs wacht de job op alle jobs in eerdere stages.
372 // NeedsSet volgt de genoemde jobs, ook als de lijst leeg is. Een
373 // gefaalde of overgeslagen need slaat deze job over, behalve bij
374 // allow_failure, when: on_failure en when: always. needs: [] heeft
375 // geen voorgangers en start meteen.
376 // Zonder needs wacht de job op alle jobs in eerdere stages. Een
377 // overgeslagen eerdere stage telt dan als klaar; een harde mislukking
378 // houdt latere stages tegen.
373 379 func Gate(jobs []Job, status map[string]string, job Job) string {
374 380 byName := map[string]Job{}
375 381 for _, j := range jobs {
@@ -409,10 +415,17 @@ func Gate(jobs []Job, status map[string]string, job Job) string {
409 415 }
410 416 failedAny := false
411 417 failedHard := false
418 skippedNeed := false
412 419 for _, d := range deps {
413 420 switch status[d.Name] {
414 case "success", "skipped":
421 case "success":
415 422 continue
423 case "skipped":
424 // Alleen een genoemde need. Zonder needs telt een
425 // overgeslagen eerdere stage als afgerond.
426 if job.NeedsSet {
427 skippedNeed = true
428 }
416 429 case "failed", "canceled":
417 430 failedAny = true
418 431 if !d.AllowFailure {
@@ -440,7 +453,7 @@ func Gate(jobs []Job, status map[string]string, job Job) string {
440 453 }
441 454 return "skip"
442 455 default:
443 if failedHard {
456 if failedHard || skippedNeed {
444 457 return "skip"
445 458 }
446 459 return "ready"
@@ -365,11 +365,17 @@ func globRegexp(pattern string) *regexp.Regexp {
365// "ready" betekent dat alle voorgangers klaar zijn.
365// "ready" betekent dat alle voorgangers klaar zijn.
366// "wait" betekent dat er nog een voorganger loopt of in de wachtrij staat.
366// "wait" betekent dat er nog een voorganger loopt of in de wachtrij staat.
367// "skip" betekent dat een voorganger mislukte zonder allow_failure,
367// "skip" betekent dat een voorganger mislukte zonder allow_failure,
368// of dat when: on_failure geen mislukking zag.
368// dat een job in needs is overgeslagen, of dat when: on_failure geen
369// mislukking zag.
369// "fail" betekent dat een verplichte need niet in deze pipeline zit.
370// "fail" betekent dat een verplichte need niet in deze pipeline zit.
370//
371//
371// NeedsSet volgt de genoemde jobs, ook als de lijst leeg is.
372// NeedsSet volgt de genoemde jobs, ook als de lijst leeg is. Een
372// Zonder needs wacht de job op alle jobs in eerdere stages.
373// gefaalde of overgeslagen need slaat deze job over, behalve bij
374// allow_failure, when: on_failure en when: always. needs: [] heeft
375// geen voorgangers en start meteen.
376// Zonder needs wacht de job op alle jobs in eerdere stages. Een
377// overgeslagen eerdere stage telt dan als klaar; een harde mislukking
378// houdt latere stages tegen.
373func Gate(jobs []Job, status map[string]string, job Job) string {
379func Gate(jobs []Job, status map[string]string, job Job) string {
374 byName := map[string]Job{}
380 byName := map[string]Job{}
375 for _, j := range jobs {
381 for _, j := range jobs {
@@ -409,10 +415,17 @@ func Gate(jobs []Job, status map[string]string, job Job) string {
409 }
415 }
410 failedAny := false
416 failedAny := false
411 failedHard := false
417 failedHard := false
418 skippedNeed := false
412 for _, d := range deps {
419 for _, d := range deps {
413 switch status[d.Name] {
420 switch status[d.Name] {
414 case "success", "skipped":
421 case "success":
415 continue
422 continue
423 case "skipped":
424 // Alleen een genoemde need. Zonder needs telt een
425 // overgeslagen eerdere stage als afgerond.
426 if job.NeedsSet {
427 skippedNeed = true
428 }
416 case "failed", "canceled":
429 case "failed", "canceled":
417 failedAny = true
430 failedAny = true
418 if !d.AllowFailure {
431 if !d.AllowFailure {
@@ -440,7 +453,7 @@ func Gate(jobs []Job, status map[string]string, job Job) string {
440 }
453 }
441 return "skip"
454 return "skip"
442 default:
455 default:
443 if failedHard {
456 if failedHard || skippedNeed {
444 return "skip"
457 return "skip"
445 }
458 }
446 return "ready"
459 return "ready"
internal/ci/gate_test.go added +110 −0
@@ -0,0 +1,110 @@
1 package ci
2
3 import "testing"
4
5 // Pipeline #26: test faalde, build werd overgeslagen, release (needs: [build])
6 // hoort zelf overgeslagen te worden. publish_aur met needs: [] start wel.
7 func TestGateSkipsWhenNeedFailedOrSkipped(t *testing.T) {
8 jobs := []Job{
9 {Name: "test", Stage: "test"},
10 {Name: "soft", Stage: "test", AllowFailure: true},
11 {Name: "build", Stage: "build", Needs: []string{"test"}, NeedsSet: true},
12 {Name: "after_soft", Stage: "build", Needs: []string{"soft"}, NeedsSet: true},
13 {Name: "release", Stage: "release", Needs: []string{"build"}, NeedsSet: true},
14 {Name: "deploy", Stage: "deploy", Needs: []string{"build", "release"}, NeedsSet: true},
15 {Name: "publish_aur", Stage: "deploy", NeedsSet: true, AllowFailure: true},
16 {Name: "later", Stage: "deploy"},
17 {Name: "anyway", Stage: "deploy", Needs: []string{"build"}, NeedsSet: true, When: "always"},
18 {Name: "onfail", Stage: "deploy", Needs: []string{"build"}, NeedsSet: true, When: "on_failure"},
19 }
20 by := map[string]Job{}
21 for _, j := range jobs {
22 by[j.Name] = j
23 }
24
25 // test is gefaald en build daardoor overgeslagen; release staat nog queued.
26 mid := map[string]string{
27 "test": "failed", "soft": "failed", "build": "skipped", "after_soft": "success",
28 "release": "queued", "deploy": "queued", "publish_aur": "queued", "later": "queued",
29 "anyway": "queued", "onfail": "queued",
30 }
31 assertGate(t, jobs, by, mid, map[string]string{
32 "build": "skip",
33 "release": "skip",
34 "deploy": "wait",
35 "publish_aur": "ready",
36 "later": "wait",
37 "anyway": "ready",
38 "onfail": "skip",
39 "after_soft": "ready",
40 })
41
42 // Nadat de keten is overgeslagen blijft publish_aur staan en valt de
43 // latere stage zonder needs alsnog weg.
44 settled := map[string]string{
45 "test": "failed", "soft": "failed", "build": "skipped", "after_soft": "success",
46 "release": "skipped", "deploy": "queued", "publish_aur": "queued", "later": "queued",
47 "anyway": "queued", "onfail": "queued",
48 }
49 assertGate(t, jobs, by, settled, map[string]string{
50 "release": "skip",
51 "deploy": "skip",
52 "later": "skip",
53 "publish_aur": "ready",
54 "anyway": "ready",
55 })
56
57 onlySkip := map[string]string{
58 "test": "skipped", "soft": "success", "build": "skipped", "after_soft": "success",
59 "release": "skipped", "deploy": "queued", "publish_aur": "queued", "later": "queued",
60 "anyway": "queued", "onfail": "queued",
61 }
62 assertGate(t, jobs, by, onlySkip, map[string]string{
63 "later": "ready",
64 "build": "skip",
65 "publish_aur": "ready",
66 "onfail": "skip",
67 })
68
69 failedNeed := map[string]string{
70 "test": "success", "soft": "success", "build": "failed", "after_soft": "success",
71 "release": "queued", "deploy": "queued", "publish_aur": "queued", "later": "queued",
72 "anyway": "queued", "onfail": "queued",
73 }
74 assertGate(t, jobs, by, failedNeed, map[string]string{
75 "release": "skip",
76 "onfail": "ready",
77 "anyway": "ready",
78 "publish_aur": "ready",
79 "later": "wait",
80 })
81
82 running := map[string]string{
83 "test": "success", "soft": "success", "build": "running", "after_soft": "success",
84 "release": "queued", "deploy": "queued", "publish_aur": "queued", "later": "queued",
85 "anyway": "queued", "onfail": "queued",
86 }
87 assertGate(t, jobs, by, running, map[string]string{
88 "release": "wait",
89 "anyway": "wait",
90 "publish_aur": "ready",
91 })
92
93 // Een overgeslagen need met allow_failure houdt de afhankelijke job toch tegen.
94 softSkipped := []Job{
95 {Name: "soft", Stage: "test", AllowFailure: true},
96 {Name: "next", Stage: "build", Needs: []string{"soft"}, NeedsSet: true},
97 }
98 if got := Gate(softSkipped, map[string]string{"soft": "skipped", "next": "queued"}, softSkipped[1]); got != "skip" {
99 t.Errorf("overgeslagen need met allow_failure: %s", got)
100 }
101 }
102
103 func assertGate(t *testing.T, jobs []Job, by map[string]Job, status, want map[string]string) {
104 t.Helper()
105 for name, decision := range want {
106 if got := Gate(jobs, status, by[name]); got != decision {
107 t.Errorf("%s: got %s, want %s", name, got, decision)
108 }
109 }
110 }
@@ -0,0 +1,110 @@
1package ci
2
3import "testing"
4
5// Pipeline #26: test faalde, build werd overgeslagen, release (needs: [build])
6// hoort zelf overgeslagen te worden. publish_aur met needs: [] start wel.
7func TestGateSkipsWhenNeedFailedOrSkipped(t *testing.T) {
8 jobs := []Job{
9 {Name: "test", Stage: "test"},
10 {Name: "soft", Stage: "test", AllowFailure: true},
11 {Name: "build", Stage: "build", Needs: []string{"test"}, NeedsSet: true},
12 {Name: "after_soft", Stage: "build", Needs: []string{"soft"}, NeedsSet: true},
13 {Name: "release", Stage: "release", Needs: []string{"build"}, NeedsSet: true},
14 {Name: "deploy", Stage: "deploy", Needs: []string{"build", "release"}, NeedsSet: true},
15 {Name: "publish_aur", Stage: "deploy", NeedsSet: true, AllowFailure: true},
16 {Name: "later", Stage: "deploy"},
17 {Name: "anyway", Stage: "deploy", Needs: []string{"build"}, NeedsSet: true, When: "always"},
18 {Name: "onfail", Stage: "deploy", Needs: []string{"build"}, NeedsSet: true, When: "on_failure"},
19 }
20 by := map[string]Job{}
21 for _, j := range jobs {
22 by[j.Name] = j
23 }
24
25 // test is gefaald en build daardoor overgeslagen; release staat nog queued.
26 mid := map[string]string{
27 "test": "failed", "soft": "failed", "build": "skipped", "after_soft": "success",
28 "release": "queued", "deploy": "queued", "publish_aur": "queued", "later": "queued",
29 "anyway": "queued", "onfail": "queued",
30 }
31 assertGate(t, jobs, by, mid, map[string]string{
32 "build": "skip",
33 "release": "skip",
34 "deploy": "wait",
35 "publish_aur": "ready",
36 "later": "wait",
37 "anyway": "ready",
38 "onfail": "skip",
39 "after_soft": "ready",
40 })
41
42 // Nadat de keten is overgeslagen blijft publish_aur staan en valt de
43 // latere stage zonder needs alsnog weg.
44 settled := map[string]string{
45 "test": "failed", "soft": "failed", "build": "skipped", "after_soft": "success",
46 "release": "skipped", "deploy": "queued", "publish_aur": "queued", "later": "queued",
47 "anyway": "queued", "onfail": "queued",
48 }
49 assertGate(t, jobs, by, settled, map[string]string{
50 "release": "skip",
51 "deploy": "skip",
52 "later": "skip",
53 "publish_aur": "ready",
54 "anyway": "ready",
55 })
56
57 onlySkip := map[string]string{
58 "test": "skipped", "soft": "success", "build": "skipped", "after_soft": "success",
59 "release": "skipped", "deploy": "queued", "publish_aur": "queued", "later": "queued",
60 "anyway": "queued", "onfail": "queued",
61 }
62 assertGate(t, jobs, by, onlySkip, map[string]string{
63 "later": "ready",
64 "build": "skip",
65 "publish_aur": "ready",
66 "onfail": "skip",
67 })
68
69 failedNeed := map[string]string{
70 "test": "success", "soft": "success", "build": "failed", "after_soft": "success",
71 "release": "queued", "deploy": "queued", "publish_aur": "queued", "later": "queued",
72 "anyway": "queued", "onfail": "queued",
73 }
74 assertGate(t, jobs, by, failedNeed, map[string]string{
75 "release": "skip",
76 "onfail": "ready",
77 "anyway": "ready",
78 "publish_aur": "ready",
79 "later": "wait",
80 })
81
82 running := map[string]string{
83 "test": "success", "soft": "success", "build": "running", "after_soft": "success",
84 "release": "queued", "deploy": "queued", "publish_aur": "queued", "later": "queued",
85 "anyway": "queued", "onfail": "queued",
86 }
87 assertGate(t, jobs, by, running, map[string]string{
88 "release": "wait",
89 "anyway": "wait",
90 "publish_aur": "ready",
91 })
92
93 // Een overgeslagen need met allow_failure houdt de afhankelijke job toch tegen.
94 softSkipped := []Job{
95 {Name: "soft", Stage: "test", AllowFailure: true},
96 {Name: "next", Stage: "build", Needs: []string{"soft"}, NeedsSet: true},
97 }
98 if got := Gate(softSkipped, map[string]string{"soft": "skipped", "next": "queued"}, softSkipped[1]); got != "skip" {
99 t.Errorf("overgeslagen need met allow_failure: %s", got)
100 }
101}
102
103func assertGate(t *testing.T, jobs []Job, by map[string]Job, status, want map[string]string) {
104 t.Helper()
105 for name, decision := range want {
106 if got := Gate(jobs, status, by[name]); got != decision {
107 t.Errorf("%s: got %s, want %s", name, got, decision)
108 }
109 }
110}
internal/runner/runner.go +3 −2
@@ -165,8 +165,9 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
165 165 }
166 166 }
167 167
168 // settle slaat jobs over die door een harde mislukking niet meer hoeven.
169 // Dat gebeurt meteen, ook als de pipelinestatus al op failed was gezet.
168 // settle slaat jobs over die door een harde mislukking of een
169 // overgeslagen need niet meer hoeven. Dat gebeurt meteen, ook als de
170 // pipelinestatus al op failed was gezet.
170 171 func (r *Runner) settle(ctx context.Context, pipelineID int64) {
171 172 for {
172 173 jobs, err := r.Store.JobsByPipeline(ctx, pipelineID)
@@ -165,8 +165,9 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
165 }
165 }
166}
166}
167
167
168// settle slaat jobs over die door een harde mislukking niet meer hoeven.
168// settle slaat jobs over die door een harde mislukking of een
169// Dat gebeurt meteen, ook als de pipelinestatus al op failed was gezet.
169// overgeslagen need niet meer hoeven. Dat gebeurt meteen, ook als de
170// pipelinestatus al op failed was gezet.
170func (r *Runner) settle(ctx context.Context, pipelineID int64) {
171func (r *Runner) settle(ctx context.Context, pipelineID int64) {
171 for {
172 for {
172 jobs, err := r.Store.JobsByPipeline(ctx, pipelineID)
173 jobs, err := r.Store.JobsByPipeline(ctx, pipelineID)
internal/runner/settle_test.go +99 −0
@@ -56,3 +56,102 @@ func TestSettleSkipsLaterStageButNotAllowFailure(t *testing.T) {
56 56 t.Fatalf("always-job houdt de pipeline open: %s %v", status, err)
57 57 }
58 58 }
59
60 // Zoals pipeline #26: test faalt, build wordt overgeslagen, en release
61 // met needs: [build] moet meekomen. publish_aur met needs: [] blijft staan.
62 func TestSettleSkipsNeedsChainButNotEmptyNeeds(t *testing.T) {
63 key := make([]byte, 32)
64 st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), key)
65 if err != nil {
66 t.Fatal(err)
67 }
68 t.Cleanup(func() { _ = st.Close() })
69 ctx := context.Background()
70 tim, err := st.UpsertUser(ctx, 1, "tim", "", false)
71 if err != nil {
72 t.Fatal(err)
73 }
74 repo, err := st.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
75 if err != nil {
76 t.Fatal(err)
77 }
78 id, err := st.CreatePipeline(ctx, repo.ID, "725e6947", "refs/heads/master", "push", "tim", "fail", []store.NewJob{
79 {Name: "test", Stage: "test", Script: "exit 1"},
80 {Name: "build", Stage: "build", Script: "go build", Needs: []string{"test"}, NeedsSet: true},
81 {Name: "release", Stage: "release", Script: "curl", Needs: []string{"build"}, NeedsSet: true},
82 {Name: "deploy", Stage: "deploy", Script: "scp", Needs: []string{"build", "release"}, NeedsSet: true},
83 {Name: "publish_aur", Stage: "deploy", Script: "aur", Needs: []string{}, NeedsSet: true, AllowFailure: true},
84 {Name: "anyway", Stage: "deploy", Script: "echo", Needs: []string{"build"}, NeedsSet: true, When: "always"},
85 })
86 if err != nil {
87 t.Fatal(err)
88 }
89 jobs, _ := st.JobsByPipeline(ctx, id)
90 for _, j := range jobs {
91 if j.Name == "test" {
92 if err := st.FinishJob(ctx, j.ID, "failed", ""); err != nil {
93 t.Fatal(err)
94 }
95 }
96 }
97 rn := &Runner{Store: st, Storage: t.TempDir()}
98 rn.settle(ctx, id)
99 got := map[string]string{}
100 jobs, _ = st.JobsByPipeline(ctx, id)
101 for _, j := range jobs {
102 got[j.Name] = j.Status
103 }
104 want := map[string]string{
105 "test": "failed", "build": "skipped", "release": "skipped", "deploy": "skipped",
106 "publish_aur": "queued", "anyway": "queued",
107 }
108 for name, status := range want {
109 if got[name] != status {
110 t.Errorf("%s: got %s, want %s (alles: %v)", name, got[name], status, got)
111 }
112 }
113 }
114
115 func TestSettleSkippedStageDoesNotBlockWithoutNeeds(t *testing.T) {
116 key := make([]byte, 32)
117 st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), key)
118 if err != nil {
119 t.Fatal(err)
120 }
121 t.Cleanup(func() { _ = st.Close() })
122 ctx := context.Background()
123 tim, err := st.UpsertUser(ctx, 1, "tim", "", false)
124 if err != nil {
125 t.Fatal(err)
126 }
127 repo, err := st.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
128 if err != nil {
129 t.Fatal(err)
130 }
131 id, err := st.CreatePipeline(ctx, repo.ID, "abc", "refs/heads/master", "push", "tim", "skip", []store.NewJob{
132 {Name: "a", Stage: "een", Script: "echo a"},
133 {Name: "b", Stage: "twee", Script: "echo b"},
134 {Name: "c", Stage: "twee", Script: "echo c", Needs: []string{"a"}, NeedsSet: true},
135 })
136 if err != nil {
137 t.Fatal(err)
138 }
139 jobs, _ := st.JobsByPipeline(ctx, id)
140 for _, j := range jobs {
141 if j.Name == "a" {
142 if err := st.SkipJob(ctx, j.ID, "skipped"); err != nil {
143 t.Fatal(err)
144 }
145 }
146 }
147 rn := &Runner{Store: st, Storage: t.TempDir()}
148 rn.settle(ctx, id)
149 got := map[string]string{}
150 jobs, _ = st.JobsByPipeline(ctx, id)
151 for _, j := range jobs {
152 got[j.Name] = j.Status
153 }
154 if got["a"] != "skipped" || got["b"] != "queued" || got["c"] != "skipped" {
155 t.Fatalf("status: %v", got)
156 }
157 }
@@ -56,3 +56,102 @@ func TestSettleSkipsLaterStageButNotAllowFailure(t *testing.T) {
56 t.Fatalf("always-job houdt de pipeline open: %s %v", status, err)
56 t.Fatalf("always-job houdt de pipeline open: %s %v", status, err)
57 }
57 }
58}
58}
59
60// Zoals pipeline #26: test faalt, build wordt overgeslagen, en release
61// met needs: [build] moet meekomen. publish_aur met needs: [] blijft staan.
62func TestSettleSkipsNeedsChainButNotEmptyNeeds(t *testing.T) {
63 key := make([]byte, 32)
64 st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), key)
65 if err != nil {
66 t.Fatal(err)
67 }
68 t.Cleanup(func() { _ = st.Close() })
69 ctx := context.Background()
70 tim, err := st.UpsertUser(ctx, 1, "tim", "", false)
71 if err != nil {
72 t.Fatal(err)
73 }
74 repo, err := st.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
75 if err != nil {
76 t.Fatal(err)
77 }
78 id, err := st.CreatePipeline(ctx, repo.ID, "725e6947", "refs/heads/master", "push", "tim", "fail", []store.NewJob{
79 {Name: "test", Stage: "test", Script: "exit 1"},
80 {Name: "build", Stage: "build", Script: "go build", Needs: []string{"test"}, NeedsSet: true},
81 {Name: "release", Stage: "release", Script: "curl", Needs: []string{"build"}, NeedsSet: true},
82 {Name: "deploy", Stage: "deploy", Script: "scp", Needs: []string{"build", "release"}, NeedsSet: true},
83 {Name: "publish_aur", Stage: "deploy", Script: "aur", Needs: []string{}, NeedsSet: true, AllowFailure: true},
84 {Name: "anyway", Stage: "deploy", Script: "echo", Needs: []string{"build"}, NeedsSet: true, When: "always"},
85 })
86 if err != nil {
87 t.Fatal(err)
88 }
89 jobs, _ := st.JobsByPipeline(ctx, id)
90 for _, j := range jobs {
91 if j.Name == "test" {
92 if err := st.FinishJob(ctx, j.ID, "failed", ""); err != nil {
93 t.Fatal(err)
94 }
95 }
96 }
97 rn := &Runner{Store: st, Storage: t.TempDir()}
98 rn.settle(ctx, id)
99 got := map[string]string{}
100 jobs, _ = st.JobsByPipeline(ctx, id)
101 for _, j := range jobs {
102 got[j.Name] = j.Status
103 }
104 want := map[string]string{
105 "test": "failed", "build": "skipped", "release": "skipped", "deploy": "skipped",
106 "publish_aur": "queued", "anyway": "queued",
107 }
108 for name, status := range want {
109 if got[name] != status {
110 t.Errorf("%s: got %s, want %s (alles: %v)", name, got[name], status, got)
111 }
112 }
113}
114
115func TestSettleSkippedStageDoesNotBlockWithoutNeeds(t *testing.T) {
116 key := make([]byte, 32)
117 st, err := store.Open(filepath.Join(t.TempDir(), "bluegit.db"), key)
118 if err != nil {
119 t.Fatal(err)
120 }
121 t.Cleanup(func() { _ = st.Close() })
122 ctx := context.Background()
123 tim, err := st.UpsertUser(ctx, 1, "tim", "", false)
124 if err != nil {
125 t.Fatal(err)
126 }
127 repo, err := st.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
128 if err != nil {
129 t.Fatal(err)
130 }
131 id, err := st.CreatePipeline(ctx, repo.ID, "abc", "refs/heads/master", "push", "tim", "skip", []store.NewJob{
132 {Name: "a", Stage: "een", Script: "echo a"},
133 {Name: "b", Stage: "twee", Script: "echo b"},
134 {Name: "c", Stage: "twee", Script: "echo c", Needs: []string{"a"}, NeedsSet: true},
135 })
136 if err != nil {
137 t.Fatal(err)
138 }
139 jobs, _ := st.JobsByPipeline(ctx, id)
140 for _, j := range jobs {
141 if j.Name == "a" {
142 if err := st.SkipJob(ctx, j.ID, "skipped"); err != nil {
143 t.Fatal(err)
144 }
145 }
146 }
147 rn := &Runner{Store: st, Storage: t.TempDir()}
148 rn.settle(ctx, id)
149 got := map[string]string{}
150 jobs, _ = st.JobsByPipeline(ctx, id)
151 for _, j := range jobs {
152 got[j.Name] = j.Status
153 }
154 if got["a"] != "skipped" || got["b"] != "queued" || got["c"] != "skipped" {
155 t.Fatalf("status: %v", got)
156 }
157}