diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go b/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go index 611e57db..02ee672b 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/steps_test.go @@ -1,6 +1,7 @@ package pipeline import ( + "encoding/json" "errors" "strings" "testing" @@ -432,4 +433,36 @@ func TestAMovedMoverLeavesARunningPipeline(t *testing.T) { } }) } + // The live path: a newer pipeline started through Start, a take-in's or a release revision's alike, takes the moved + // mover out of the older running pipeline over the same store (H-A-223, H-A-213). + starts := []struct { + name string + begin Begin + }{ + {"a take-in", Begin{Branch: "main", Source: 55, Revision: 55, Call: "0123456789abcdef", Movers: []seat.Mover{{Module: "b", Commit: "c2", Fingerprint: "src2:b2"}}}}, + {"a release revision", Begin{Branch: "main", Source: 54, Revision: 57, Call: "release of mesh-sdk 0.1.26", Movers: []seat.Mover{{Module: "b", Commit: "c1", Fingerprint: "src2:b2"}}}}, + } + for _, r := range starts { + t.Run("started by "+r.name, func(t *testing.T) { + store := &MoverStore{Raw: newMemRaw()} + raw, _ := json.Marshal(running()) + if err := store.Create("main.54", raw); err != nil { + t.Fatal(err) + } + h := &Hearer{Store: store, Say: func(string, any) error { return nil }, Now: func() time.Time { return t0 }} + s := &Starter{Pipelines: store, Store: store, Say: func(string, any) error { return nil }, Now: func() time.Time { return t0 }, + Supersede: func(newer seat.Pipeline) { h.SupersedeRunning(newer) }} + if ok, err := s.Start(r.begin); !ok || err != nil { + t.Fatalf("start = %v, %v", ok, err) + } + p, _, _ := store.Get("main.54") + var got []string + for _, st := range p.Steps { + got = append(got, st.Module+" "+st.Step+" "+st.Outcome) + } + if s := p.Outcome + "; " + strings.Join(got, "; "); s != "running; a build running; b build superseded; b lint superseded" { + t.Errorf("the older pipeline after %s = %s; want b left it", r.name, s) + } + }) + } } diff --git a/modules/mesh-delivery-pipeline/internal/pipeline/supersede.go b/modules/mesh-delivery-pipeline/internal/pipeline/supersede.go index 66d2f2c6..5d798452 100644 --- a/modules/mesh-delivery-pipeline/internal/pipeline/supersede.go +++ b/modules/mesh-delivery-pipeline/internal/pipeline/supersede.go @@ -64,15 +64,15 @@ func allLeft(p seat.Pipeline) bool { return true } -// SupersedeRunning takes out of every older running pipeline of newer's branch each mover whose fingerprint newer moved +// SupersedeRunning takes out of every older running pipeline of newer's branch, read by that branch's keys alone, each mover whose fingerprint newer moved // (H-A-223): its open steps end superseded, naming newer, never failed; a step reading a test run leaves it, as a cancel's // does; the mover is kept in the pipeline's superseded, so the end judgement (H-A-163) counts it as left and newer carries // it. A pipeline then judged ends as at a step's end, by its other movers alone; one every mover left ends superseded. // A run on request's pipeline is never touched. It answers the pipelines it touched. func (h *Hearer) SupersedeRunning(newer seat.Pipeline) []string { - pkeys, err := allKeys(h.Store) + pkeys, err := branchKeys(h.Store, newer.Branch) if err != nil { - h.logf("the running pipelines are not listed, so none is superseded by %s: %v", newer.Pipeline, err) + h.logf("the running pipelines of %s are not listed, so none is superseded by %s: %v", newer.Branch, newer.Pipeline, err) return nil } var touched []string