BlueGit

timfa bluegit

Merged

Stage-status: geannuleerde allow_failure-job niet als geslaagd tonen

!94 · merged 3 weeks ago

timfa wants to merge 1 commit from cursor/stage-status into stage

Pipeline

#405 Passed
Stage: build

Reviews

  • No reviews yet.

Merged by timfa on 27 October 2026 9ad605ef

Overview Commits 1 Pipelines 1 Changes 2

Changes

2 files changed +67 −4
internal/server/pipeline_page.go +28 −4
@@ -345,7 +345,7 @@ func displayStatus(pipe string, jobs []store.Job) string {
345 345 }
346 346 warn := false
347 347 for _, j := range jobs {
348 if j.Status == "failed" && j.AllowFailure {
348 if (j.Status == "failed" || j.Status == "canceled") && j.AllowFailure && !j.Obsolete() {
349 349 warn = true
350 350 }
351 351 }
@@ -394,6 +394,7 @@ func stageViews(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) s
394 394
395 395 func stageStatus(jobs []store.Job) string {
396 396 pending, failed, warning, running, canceled := false, false, false, false, false
397 softCanceled, passed := false, false
397 398 seen := false
398 399 for _, j := range jobs {
399 400 seen = true
@@ -404,8 +405,15 @@ func stageStatus(jobs []store.Job) string {
404 405 failed = true
405 406 case j.Status == "canceled" && !j.AllowFailure:
406 407 canceled = true
408 case j.Status == "canceled":
409 // allow_failure telt niet als fout, maar een geannuleerde job
410 // is nooit geslaagd: alleen-geannuleerd wordt grijs, gemengd
411 // met geslaagde jobs een waarschuwing.
412 softCanceled = true
407 413 case j.Status == "failed" && j.AllowFailure:
408 414 warning = true
415 case j.Status == "success":
416 passed = true
409 417 case j.Status == "queued" || j.Status == "manual":
410 418 pending = true
411 419 }
@@ -419,13 +427,13 @@ func stageStatus(jobs []store.Job) string {
419 427 if failed {
420 428 return "failed"
421 429 }
422 if canceled {
423 if store.PipelineObsolete(jobs) {
430 if canceled || (softCanceled && !passed && !warning && !pending) {
431 if store.PipelineObsolete(jobs) || (!canceled && allCanceledObsolete(jobs)) {
424 432 return "obsolete"
425 433 }
426 434 return "canceled"
427 435 }
428 if warning {
436 if warning || (softCanceled && passed) {
429 437 return "warning"
430 438 }
431 439 if pending {
@@ -918,3 +926,19 @@ func jobCancel(tr func(string, ...any) string, can bool, job store.Job) *CancelV
918 926 }
919 927 return cancelView(tr, tr("pipe.cancelJob"), tr("pipe.cancelAsk"), []store.Job{job})
920 928 }
929
930 // allCanceledObsolete: elke geannuleerde job (ook allow_failure) is
931 // automatisch door een nieuwere pipeline gestopt.
932 func allCanceledObsolete(jobs []store.Job) bool {
933 seen := false
934 for _, j := range jobs {
935 if j.Status != "canceled" {
936 continue
937 }
938 if !j.Obsolete() {
939 return false
940 }
941 seen = true
942 }
943 return seen
944 }
@@ -345,7 +345,7 @@ func displayStatus(pipe string, jobs []store.Job) string {
345 }
345 }
346 warn := false
346 warn := false
347 for _, j := range jobs {
347 for _, j := range jobs {
348 if j.Status == "failed" && j.AllowFailure {
348 if (j.Status == "failed" || j.Status == "canceled") && j.AllowFailure && !j.Obsolete() {
349 warn = true
349 warn = true
350 }
350 }
351 }
351 }
@@ -394,6 +394,7 @@ func stageViews(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) s
394
394
395func stageStatus(jobs []store.Job) string {
395func stageStatus(jobs []store.Job) string {
396 pending, failed, warning, running, canceled := false, false, false, false, false
396 pending, failed, warning, running, canceled := false, false, false, false, false
397 softCanceled, passed := false, false
397 seen := false
398 seen := false
398 for _, j := range jobs {
399 for _, j := range jobs {
399 seen = true
400 seen = true
@@ -404,8 +405,15 @@ func stageStatus(jobs []store.Job) string {
404 failed = true
405 failed = true
405 case j.Status == "canceled" && !j.AllowFailure:
406 case j.Status == "canceled" && !j.AllowFailure:
406 canceled = true
407 canceled = true
408 case j.Status == "canceled":
409 // allow_failure telt niet als fout, maar een geannuleerde job
410 // is nooit geslaagd: alleen-geannuleerd wordt grijs, gemengd
411 // met geslaagde jobs een waarschuwing.
412 softCanceled = true
407 case j.Status == "failed" && j.AllowFailure:
413 case j.Status == "failed" && j.AllowFailure:
408 warning = true
414 warning = true
415 case j.Status == "success":
416 passed = true
409 case j.Status == "queued" || j.Status == "manual":
417 case j.Status == "queued" || j.Status == "manual":
410 pending = true
418 pending = true
411 }
419 }
@@ -419,13 +427,13 @@ func stageStatus(jobs []store.Job) string {
419 if failed {
427 if failed {
420 return "failed"
428 return "failed"
421 }
429 }
422 if canceled {
430 if canceled || (softCanceled && !passed && !warning && !pending) {
423 if store.PipelineObsolete(jobs) {
431 if store.PipelineObsolete(jobs) || (!canceled && allCanceledObsolete(jobs)) {
424 return "obsolete"
432 return "obsolete"
425 }
433 }
426 return "canceled"
434 return "canceled"
427 }
435 }
428 if warning {
436 if warning || (softCanceled && passed) {
429 return "warning"
437 return "warning"
430 }
438 }
431 if pending {
439 if pending {
@@ -918,3 +926,19 @@ func jobCancel(tr func(string, ...any) string, can bool, job store.Job) *CancelV
918 }
926 }
919 return cancelView(tr, tr("pipe.cancelJob"), tr("pipe.cancelAsk"), []store.Job{job})
927 return cancelView(tr, tr("pipe.cancelJob"), tr("pipe.cancelAsk"), []store.Job{job})
920}
928}
929
930// allCanceledObsolete: elke geannuleerde job (ook allow_failure) is
931// automatisch door een nieuwere pipeline gestopt.
932func allCanceledObsolete(jobs []store.Job) bool {
933 seen := false
934 for _, j := range jobs {
935 if j.Status != "canceled" {
936 continue
937 }
938 if !j.Obsolete() {
939 return false
940 }
941 seen = true
942 }
943 return seen
944}
internal/server/stage_status_test.go added +39 −0
@@ -0,0 +1,39 @@
1 package server
2
3 import (
4 "testing"
5
6 "gitlab.com/Timfa/bluegit/internal/store"
7 )
8
9 func TestStageStatusCanceled(t *testing.T) {
10 cases := []struct {
11 name string
12 jobs []store.Job
13 want string
14 }{
15 {"alleen geannuleerde allow_failure (posprint #395 publish:aur)", []store.Job{{Status: "canceled", AllowFailure: true}}, "canceled"},
16 {"alleen geannuleerd", []store.Job{{Status: "canceled"}}, "canceled"},
17 {"verouderd allow_failure", []store.Job{{Status: "canceled", AllowFailure: true, Reason: store.ReasonSuperseded}}, "obsolete"},
18 {"verouderd", []store.Job{{Status: "canceled", Reason: store.ReasonSuperseded}}, "obsolete"},
19 {"geslaagd + geannuleerd allow_failure", []store.Job{{Status: "success"}, {Status: "canceled", AllowFailure: true}}, "warning"},
20 {"geslaagd + mislukt allow_failure", []store.Job{{Status: "success"}, {Status: "failed", AllowFailure: true}}, "warning"},
21 {"geslaagd + overgeslagen", []store.Job{{Status: "success"}, {Status: "skipped"}}, "passed"},
22 {"alleen overgeslagen", []store.Job{{Status: "skipped"}}, "skipped"},
23 {"handmatig", []store.Job{{Status: "manual"}}, "pending"},
24 {"geslaagd", []store.Job{{Status: "success"}}, "passed"},
25 }
26 for _, c := range cases {
27 if got := stageStatus(c.jobs); got != c.want {
28 t.Errorf("%s: %s, wil %s", c.name, got, c.want)
29 }
30 }
31 // Pipeline 395: release handmatig geannuleerd, publish:aur (allow_failure) geannuleerd.
32 jobs := []store.Job{{Status: "success"}, {Status: "canceled"}, {Status: "canceled", AllowFailure: true}}
33 if got := displayStatus("canceled", jobs); got != "canceled" {
34 t.Errorf("pipeline: %s", got)
35 }
36 if got := displayStatus("success", []store.Job{{Status: "success"}, {Status: "canceled", AllowFailure: true}}); got != "warning" {
37 t.Errorf("geslaagde pipeline met geannuleerde allow_failure-job: %s", got)
38 }
39 }
@@ -0,0 +1,39 @@
1package server
2
3import (
4 "testing"
5
6 "gitlab.com/Timfa/bluegit/internal/store"
7)
8
9func TestStageStatusCanceled(t *testing.T) {
10 cases := []struct {
11 name string
12 jobs []store.Job
13 want string
14 }{
15 {"alleen geannuleerde allow_failure (posprint #395 publish:aur)", []store.Job{{Status: "canceled", AllowFailure: true}}, "canceled"},
16 {"alleen geannuleerd", []store.Job{{Status: "canceled"}}, "canceled"},
17 {"verouderd allow_failure", []store.Job{{Status: "canceled", AllowFailure: true, Reason: store.ReasonSuperseded}}, "obsolete"},
18 {"verouderd", []store.Job{{Status: "canceled", Reason: store.ReasonSuperseded}}, "obsolete"},
19 {"geslaagd + geannuleerd allow_failure", []store.Job{{Status: "success"}, {Status: "canceled", AllowFailure: true}}, "warning"},
20 {"geslaagd + mislukt allow_failure", []store.Job{{Status: "success"}, {Status: "failed", AllowFailure: true}}, "warning"},
21 {"geslaagd + overgeslagen", []store.Job{{Status: "success"}, {Status: "skipped"}}, "passed"},
22 {"alleen overgeslagen", []store.Job{{Status: "skipped"}}, "skipped"},
23 {"handmatig", []store.Job{{Status: "manual"}}, "pending"},
24 {"geslaagd", []store.Job{{Status: "success"}}, "passed"},
25 }
26 for _, c := range cases {
27 if got := stageStatus(c.jobs); got != c.want {
28 t.Errorf("%s: %s, wil %s", c.name, got, c.want)
29 }
30 }
31 // Pipeline 395: release handmatig geannuleerd, publish:aur (allow_failure) geannuleerd.
32 jobs := []store.Job{{Status: "success"}, {Status: "canceled"}, {Status: "canceled", AllowFailure: true}}
33 if got := displayStatus("canceled", jobs); got != "canceled" {
34 t.Errorf("pipeline: %s", got)
35 }
36 if got := displayStatus("success", []store.Job{{Status: "success"}, {Status: "canceled", AllowFailure: true}}); got != "warning" {
37 t.Errorf("geslaagde pipeline met geannuleerde allow_failure-job: %s", got)
38 }
39}