fix: ververs actieve pipelines en toon de wachtrijplek
De lijst en de pipelinedetails halen elke drie seconden JSON op zolang er een pending of running run is, en passen de rijen ter plekke aan. Een startklare job toont zijn plek in Steves globale wachtrij. Co-authored-by: tim <tim@timfalken.com>
@@ -107,10 +107,12 @@ Het commit moet in de repository bestaan. Het asset moet een artifact zijn van e
107
107
108
108
## Wanneer een job start
109
109
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1).
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.
111
112
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen.
111
113
112
114
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).
113
115
114
116
## Live log
115
117
116
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.
118
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. Diezelfde poll werkt de wachtrijplek bij zolang de job nog queued is. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.
@@ -107,10 +107,12 @@ Het commit moet in de repository bestaan. Het asset moet een artifact zijn van e107
107
108
## Wanneer een job start108
## Wanneer een job start109
109
110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1).110
`Gate` in `internal/ci` geeft `ready`, `wait`, `skip` of `fail`. `skip` volgt op een harde mislukking bij `when: on_success`, of op succes bij `when: on_failure`. `when: always` wacht tot de voorgangers klaar zijn en draait dan toch. Een job met `allow_failure` telt niet als harde mislukking. De runner verwerkt pipelines elke twee seconden, met `ci.concurrency` tegelijk (standaard 1). Jobs die al lopen vullen die slots. Een startklare job die nog wacht toont `In wachtrij (#n)` in de pipelines-lijst, de stage-popover en op de jobpagina. Het nummer is de plek in Steves globale wachtrij, over alle repositories; de eerstvolgende wachtende job is `#1`.111
112
Zolang er een pipeline of job `pending` of `running` is, halen de pipelines-lijst en de pipelinedetails elke drie seconden JSON op en werken de rijen bij zonder de pagina te herladen. Open popovers en de scrollpositie blijven staan. Zijn er geen actieve runs meer, dan stopt dat pollen.111
113
112
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).114
Ontbreekt Docker, dan faalt de job met een regel in het log. De time-out is `ci.timeout_seconds` (standaard 1800).113
115
114
## Live log116
## Live log115
117
116
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.118
De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt, met `?offset=` op het log-adres. Diezelfde poll werkt de wachtrijplek bij zolang de job nog queued is. De console scrolt mee zolang je onderaan staat; scrol je omhoog, dan blijft de plek staan. ANSI-kleuren worden classes. Geheimen van acht tekens of meer zijn `[MASKED]` op het moment dat de regel wordt weggeschreven, ook in die stream.@@ -229,6 +229,7 @@ var en = map[string]string{
229
229
"pipe.duration": "Duration",
230
230
"pipe.finished": "Finished",
231
231
"pipe.queued": "Queued",
232
"pipe.queuePos": "In queue (#%d)",
232
233
"pipe.timeout": "Timeout",
233
234
"pipe.environment": "Environment",
234
235
"pipe.runner": "Runner",
@@ -229,6 +229,7 @@ var en = map[string]string{229
"pipe.duration": "Duration",229
"pipe.duration": "Duration",230
"pipe.finished": "Finished",230
"pipe.finished": "Finished",231
"pipe.queued": "Queued",231
"pipe.queued": "Queued",232
"pipe.queuePos": "In queue (#%d)",232
"pipe.timeout": "Timeout",233
"pipe.timeout": "Timeout",233
"pipe.environment": "Environment",234
"pipe.environment": "Environment",234
"pipe.runner": "Runner",235
"pipe.runner": "Runner",@@ -236,6 +236,7 @@ var nl = map[string]string{
236
236
"pipe.duration": "Duur",
237
237
"pipe.finished": "Klaar",
238
238
"pipe.queued": "Wachtrij",
239
"pipe.queuePos": "In wachtrij (#%d)",
239
240
"pipe.timeout": "Timeout",
240
241
"pipe.environment": "Omgeving",
241
242
"pipe.runner": "Runner",
@@ -846,6 +847,7 @@ var de = map[string]string{
846
847
"pipe.duration": "Dauer",
847
848
"pipe.finished": "Beendet",
848
849
"pipe.queued": "Warteschlange",
850
"pipe.queuePos": "In der Warteschlange (#%d)",
849
851
"pipe.timeout": "Timeout",
850
852
"pipe.environment": "Umgebung",
851
853
"pipe.runner": "Runner",
@@ -1456,6 +1458,7 @@ var fr = map[string]string{
1456
1458
"pipe.duration": "Durée",
1457
1459
"pipe.finished": "Terminé",
1458
1460
"pipe.queued": "File",
1461
"pipe.queuePos": "Dans la file (#%d)",
1459
1462
"pipe.timeout": "Délai",
1460
1463
"pipe.environment": "Environnement",
1461
1464
"pipe.runner": "Runner",
@@ -236,6 +236,7 @@ var nl = map[string]string{236
"pipe.duration": "Duur",236
"pipe.duration": "Duur",237
"pipe.finished": "Klaar",237
"pipe.finished": "Klaar",238
"pipe.queued": "Wachtrij",238
"pipe.queued": "Wachtrij",239
"pipe.queuePos": "In wachtrij (#%d)",239
"pipe.timeout": "Timeout",240
"pipe.timeout": "Timeout",240
"pipe.environment": "Omgeving",241
"pipe.environment": "Omgeving",241
"pipe.runner": "Runner",242
"pipe.runner": "Runner",@@ -846,6 +847,7 @@ var de = map[string]string{846
"pipe.duration": "Dauer",847
"pipe.duration": "Dauer",847
"pipe.finished": "Beendet",848
"pipe.finished": "Beendet",848
"pipe.queued": "Warteschlange",849
"pipe.queued": "Warteschlange",850
"pipe.queuePos": "In der Warteschlange (#%d)",849
"pipe.timeout": "Timeout",851
"pipe.timeout": "Timeout",850
"pipe.environment": "Umgebung",852
"pipe.environment": "Umgebung",851
"pipe.runner": "Runner",853
"pipe.runner": "Runner",@@ -1456,6 +1458,7 @@ var fr = map[string]string{1456
"pipe.duration": "Durée",1458
"pipe.duration": "Durée",1457
"pipe.finished": "Terminé",1459
"pipe.finished": "Terminé",1458
"pipe.queued": "File",1460
"pipe.queued": "File",1461
"pipe.queuePos": "Dans la file (#%d)",1459
"pipe.timeout": "Délai",1462
"pipe.timeout": "Délai",1460
"pipe.environment": "Environnement",1463
"pipe.environment": "Environnement",1461
"pipe.runner": "Runner",1464
"pipe.runner": "Runner",@@ -144,8 +144,14 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {
144
144
if busy, _ := r.Store.ResourceBusy(ctx, j.RepoID, j.ResourceGroup, j.ID); busy {
145
145
continue
146
146
}
147
// Meer jobs dan ci.concurrency blijven queued, met een plek
148
// in de wachtrij. Het slot gaat pas vrij als execute klaar is.
149
if !r.acquireSlot() {
150
continue
151
}
147
152
ok, err := r.Store.MarkJobRunning(ctx, j.ID)
148
153
if err != nil || !ok {
154
r.releaseSlot()
149
155
continue
150
156
}
151
157
status[j.Name] = "running"
@@ -210,11 +216,30 @@ func indexOf(jobs []store.Job, name string) int {
210
216
return 0
211
217
}
212
218
213
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
214
if r.slots != nil {
215
r.slots <- struct{}{}
216
defer func() { <-r.slots }()
219
func (r *Runner) acquireSlot() bool {
220
if r.slots == nil {
221
return true
217
222
}
223
select {
224
case r.slots <- struct{}{}:
225
return true
226
default:
227
return false
228
}
229
}
230
231
func (r *Runner) releaseSlot() {
232
if r.slots == nil {
233
return
234
}
235
select {
236
case <-r.slots:
237
default:
238
}
239
}
240
241
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
242
defer r.releaseSlot()
218
243
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)
219
244
base, stop := context.WithCancel(ctx)
220
245
r.track(job.ID, stop)
@@ -144,8 +144,14 @@ func (r *Runner) schedule(ctx context.Context, p store.Pipeline) {144
if busy, _ := r.Store.ResourceBusy(ctx, j.RepoID, j.ResourceGroup, j.ID); busy {144
if busy, _ := r.Store.ResourceBusy(ctx, j.RepoID, j.ResourceGroup, j.ID); busy {145
continue145
continue146
}146
}147
// Meer jobs dan ci.concurrency blijven queued, met een plek148
// in de wachtrij. Het slot gaat pas vrij als execute klaar is.149
if !r.acquireSlot() {150
continue151
}147
ok, err := r.Store.MarkJobRunning(ctx, j.ID)152
ok, err := r.Store.MarkJobRunning(ctx, j.ID)148
if err != nil || !ok {153
if err != nil || !ok {154
r.releaseSlot()149
continue155
continue150
}156
}151
status[j.Name] = "running"157
status[j.Name] = "running"@@ -210,11 +216,30 @@ func indexOf(jobs []store.Job, name string) int {210
return 0216
return 0211
}217
}212
218
213
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {219
func (r *Runner) acquireSlot() bool {214
if r.slots != nil {220
if r.slots == nil {215
r.slots <- struct{}{}221
return true216
defer func() { <-r.slots }()217
}222
}223
select {224
case r.slots <- struct{}{}:225
return true226
default:227
return false228
}229
}230
231
func (r *Runner) releaseSlot() {232
if r.slots == nil {233
return234
}235
select {236
case <-r.slots:237
default:238
}239
}240
241
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {242
defer r.releaseSlot()218
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)243
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)219
base, stop := context.WithCancel(ctx)244
base, stop := context.WithCancel(ctx)220
r.track(job.ID, stop)245
r.track(job.ID, stop)@@ -0,0 +1,22 @@
1
package runner
2
3
import "testing"
4
5
func TestAcquireSlotStopsAtConcurrency(t *testing.T) {
6
r := &Runner{slots: make(chan struct{}, 1)}
7
if !r.acquireSlot() {
8
t.Fatal("eerste slot")
9
}
10
if r.acquireSlot() {
11
t.Fatal("tweede slot hoort vol te zijn")
12
}
13
r.releaseSlot()
14
if !r.acquireSlot() {
15
t.Fatal("na vrijgeven")
16
}
17
open := &Runner{}
18
if !open.acquireSlot() {
19
t.Fatal("zonder limiet")
20
}
21
open.releaseSlot()
22
}
@@ -0,0 +1,22 @@1
package runner2
3
import "testing"4
5
func TestAcquireSlotStopsAtConcurrency(t *testing.T) {6
r := &Runner{slots: make(chan struct{}, 1)}7
if !r.acquireSlot() {8
t.Fatal("eerste slot")9
}10
if r.acquireSlot() {11
t.Fatal("tweede slot hoort vol te zijn")12
}13
r.releaseSlot()14
if !r.acquireSlot() {15
t.Fatal("na vrijgeven")16
}17
open := &Runner{}18
if !open.acquireSlot() {19
t.Fatal("zonder limiet")20
}21
open.releaseSlot()22
}@@ -192,6 +192,6 @@ func (s *Server) fillMRPipeline(r *http.Request, v *View, repo store.Repo, mr st
192
192
if err != nil {
193
193
return
194
194
}
195
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{})
195
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{}, s.queueRanks(r.Context()))
196
196
v.MRPipe = &row
197
197
}
@@ -192,6 +192,6 @@ func (s *Server) fillMRPipeline(r *http.Request, v *View, repo store.Repo, mr st192
if err != nil {192
if err != nil {193
return193
return194
}194
}195
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{})195
row := s.pipeRow(r, s.langOf(r), repo, p, map[string]store.User{}, s.queueRanks(r.Context()))196
v.MRPipe = &row196
v.MRPipe = &row197
}197
}@@ -1,8 +1,10 @@
1
1
package server
2
2
3
3
import (
4
"bytes"
4
5
"encoding/json"
5
6
"net/http"
7
"net/url"
6
8
"strconv"
7
9
"strings"
8
10
"time"
@@ -46,6 +48,7 @@ type JobLink struct {
46
48
Name string
47
49
Status string
48
50
Label string
51
Queue string
49
52
Current bool
50
53
Stage string
51
54
}
@@ -82,6 +85,7 @@ type JobPage struct {
82
85
Environment string
83
86
EnvironmentURL string
84
87
EnvironmentLink string
88
Queue string
85
89
}
86
90
87
91
// LogBlock is een losse regel of een inklapbare sectie.
@@ -106,17 +110,42 @@ func (s *Server) fillPipelines(r *http.Request, v *View, repo store.Repo) {
106
110
list, _ := s.Store.ListPipelines(r.Context(), repo.ID)
107
111
q := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("q")))
108
112
v.Query = r.URL.Query().Get("q")
113
ranks := s.queueRanks(r.Context())
109
114
users := map[string]store.User{}
110
115
for _, p := range list {
111
row := s.pipeRow(r, lang, repo, p, users)
116
row := s.pipeRow(r, lang, repo, p, users, ranks)
112
117
if q != "" && !pipeMatches(row, q) {
113
118
continue
114
119
}
120
if rowLive(row) {
121
v.Live = true
122
}
115
123
v.PipeRows = append(v.PipeRows, row)
116
124
}
125
v.LiveURL = repoURL(repo) + "/-/pipelines"
126
if raw := strings.TrimSpace(r.URL.Query().Get("q")); raw != "" {
127
v.LiveURL += "?q=" + url.QueryEscape(raw)
128
}
129
}
130
131
func rowLive(row PipeRow) bool {
132
if row.Status == "pending" || row.Status == "running" {
133
return true
134
}
135
for _, st := range row.Stages {
136
if st.Status == "pending" || st.Status == "running" {
137
return true
138
}
139
for _, j := range st.Jobs {
140
if j.Status == "pending" || j.Status == "running" {
141
return true
142
}
143
}
144
}
145
return false
117
146
}
118
147
119
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User) PipeRow {
148
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User, ranks map[int64]int) PipeRow {
120
149
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
121
150
name, kind := ci.SplitRef(p.Ref)
122
151
status := displayStatus(p.Status, jobs)
@@ -138,7 +167,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto
138
167
Duration: formatClock(end.Sub(start)), When: i18n.Ago(lang, p.CreatedAt.Unix()),
139
168
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),
140
169
Ref: name, RefKind: kind, Actor: actor, Avatar: avatar, Initial: initial,
141
Stages: stageViews(lang, jobs, func(key string) string { return s.tr(r, key) }),
170
Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),
142
171
}
143
172
}
144
173
@@ -208,7 +237,7 @@ func displayStatus(pipe string, jobs []store.Job) string {
208
237
return pipe
209
238
}
210
239
211
func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []StageView {
240
func stageViews(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []StageView {
212
241
var order []string
213
242
by := map[string][]store.Job{}
214
243
for _, j := range jobs {
@@ -225,11 +254,13 @@ func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []Stag
225
254
var links []JobLink
226
255
for _, j := range group {
227
256
st := jobDisplay(j)
228
links = append(links, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage})
257
links = append(links, JobLink{
258
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,
259
Queue: queueText(tr, ranks, j.ID),
260
})
229
261
}
230
262
out = append(out, StageView{Name: name, Status: status, Label: label, Tip: name + ": " + strings.ToLower(label), Jobs: links})
231
263
}
232
_ = lang
233
264
return out
234
265
}
235
266
@@ -354,11 +385,18 @@ func (s *Server) jobLog(w http.ResponseWriter, r *http.Request) {
354
385
if offset < 0 || offset > len(job.Log) {
355
386
offset = 0
356
387
}
388
queue := ""
389
if job.Status == "queued" {
390
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
391
queue = queueText(tr, s.queueRanks(r.Context()), job.ID)
392
}
357
393
w.Header().Set("Content-Type", "application/json")
394
w.Header().Set("Cache-Control", "no-store")
358
395
_ = json.NewEncoder(w).Encode(map[string]any{
359
396
"offset": len(job.Log),
360
397
"status": job.Status,
361
398
"text": job.Log[offset:],
399
"queue": queue,
362
400
})
363
401
}
364
402
@@ -438,6 +476,8 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
438
476
if !end.IsZero() {
439
477
finished = i18n.Ago(lang, end.Unix())
440
478
}
479
ranks := s.queueRanks(r.Context())
480
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
441
481
var stages []string
442
482
seen := map[string]bool{}
443
483
var related []JobLink
@@ -447,7 +487,10 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
447
487
stages = append(stages, j.Stage)
448
488
}
449
489
st := jobDisplay(j)
450
related = append(related, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: s.tr(r, "pipe."+st), Current: j.ID == job.ID, Stage: j.Stage})
490
related = append(related, JobLink{
491
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Current: j.ID == job.ID, Stage: j.Stage,
492
Queue: queueText(tr, ranks, j.ID),
493
})
451
494
}
452
495
sourceKey := "pipe.src." + p.Source
453
496
source := s.tr(r, sourceKey)
@@ -462,6 +505,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
462
505
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
463
506
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",
464
507
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),
508
Queue: queueText(tr, ranks, job.ID),
465
509
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),
466
510
}
467
511
}
@@ -531,6 +575,114 @@ func parseLog(raw string) []LogBlock {
531
575
return blocks
532
576
}
533
577
578
func wantsJSON(r *http.Request) bool {
579
return strings.Contains(r.Header.Get("Accept"), "application/json")
580
}
581
582
func jobsLive(pipe string, jobs []store.Job) bool {
583
if pipe == "queued" || pipe == "running" {
584
return true
585
}
586
for _, j := range jobs {
587
if j.Status == "queued" || j.Status == "running" {
588
return true
589
}
590
}
591
return false
592
}
593
594
func linksFor(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []JobLink {
595
out := make([]JobLink, 0, len(jobs))
596
for _, j := range jobs {
597
st := jobDisplay(j)
598
out = append(out, JobLink{
599
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,
600
Queue: queueText(tr, ranks, j.ID),
601
})
602
}
603
return out
604
}
605
606
func (s *Server) partial(name string, v View) string {
607
var buf bytes.Buffer
608
tmpl := s.byLang[v.Lang]
609
if tmpl == nil {
610
tmpl = s.tmpl
611
}
612
if tmpl == nil {
613
return ""
614
}
615
if err := tmpl.ExecuteTemplate(&buf, name, v); err != nil && s.Log != nil {
616
s.Log.Error("sjabloon", "name", name, "err", err)
617
}
618
return buf.String()
619
}
620
621
func (s *Server) writePipeList(w http.ResponseWriter, v View) {
622
type job struct {
623
ID int64 `json:"id"`
624
Name string `json:"name"`
625
Status string `json:"status"`
626
Label string `json:"label"`
627
Queue string `json:"queue"`
628
}
629
type stage struct {
630
Name string `json:"name"`
631
Status string `json:"status"`
632
Tip string `json:"tip"`
633
Jobs []job `json:"jobs"`
634
}
635
type row struct {
636
ID int64 `json:"id"`
637
Status string `json:"status"`
638
Label string `json:"label"`
639
Duration string `json:"duration"`
640
When string `json:"when"`
641
Stages []stage `json:"stages"`
642
HTML string `json:"html"`
643
}
644
rows := make([]row, 0, len(v.PipeRows))
645
for _, pr := range v.PipeRows {
646
one := v
647
one.PipeRows = []PipeRow{pr}
648
item := row{
649
ID: pr.ID, Status: pr.Status, Label: pr.Label, Duration: pr.Duration, When: pr.When,
650
HTML: s.partial("pipe-rows", one),
651
}
652
for _, st := range pr.Stages {
653
jobs := make([]job, 0, len(st.Jobs))
654
for _, j := range st.Jobs {
655
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Queue: j.Queue})
656
}
657
item.Stages = append(item.Stages, stage{Name: st.Name, Status: st.Status, Tip: st.Tip, Jobs: jobs})
658
}
659
rows = append(rows, item)
660
}
661
w.Header().Set("Content-Type", "application/json")
662
w.Header().Set("Cache-Control", "no-store")
663
_ = json.NewEncoder(w).Encode(map[string]any{"active": v.Live, "rows": rows})
664
}
665
666
func (s *Server) writePipeDetail(w http.ResponseWriter, v View) {
667
type job struct {
668
ID int64 `json:"id"`
669
Name string `json:"name"`
670
Status string `json:"status"`
671
Label string `json:"label"`
672
Stage string `json:"stage"`
673
Queue string `json:"queue"`
674
}
675
jobs := make([]job, 0, len(v.PipeJobs))
676
for _, j := range v.PipeJobs {
677
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Stage: j.Stage, Queue: j.Queue})
678
}
679
w.Header().Set("Content-Type", "application/json")
680
w.Header().Set("Cache-Control", "no-store")
681
_ = json.NewEncoder(w).Encode(map[string]any{
682
"active": v.Live, "status": v.PipeStatus, "label": v.PipeLabel, "jobs": jobs,
683
})
684
}
685
534
686
func clockOf(ts string) string {
535
687
if t, err := time.Parse(time.RFC3339, ts); err == nil {
536
688
return t.UTC().Format("15:04:05")
@@ -1,8 +1,10 @@1
package server1
package server2
2
3
import (3
import (4
"bytes"4
"encoding/json"5
"encoding/json"5
"net/http"6
"net/http"7
"net/url"6
"strconv"8
"strconv"7
"strings"9
"strings"8
"time"10
"time"@@ -46,6 +48,7 @@ type JobLink struct {46
Name string48
Name string47
Status string49
Status string48
Label string50
Label string51
Queue string49
Current bool52
Current bool50
Stage string53
Stage string51
}54
}@@ -82,6 +85,7 @@ type JobPage struct {82
Environment string85
Environment string83
EnvironmentURL string86
EnvironmentURL string84
EnvironmentLink string87
EnvironmentLink string88
Queue string85
}89
}86
90
87
// LogBlock is een losse regel of een inklapbare sectie.91
// LogBlock is een losse regel of een inklapbare sectie.@@ -106,17 +110,42 @@ func (s *Server) fillPipelines(r *http.Request, v *View, repo store.Repo) {106
list, _ := s.Store.ListPipelines(r.Context(), repo.ID)110
list, _ := s.Store.ListPipelines(r.Context(), repo.ID)107
q := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("q")))111
q := strings.ToLower(strings.TrimSpace(r.URL.Query().Get("q")))108
v.Query = r.URL.Query().Get("q")112
v.Query = r.URL.Query().Get("q")113
ranks := s.queueRanks(r.Context())109
users := map[string]store.User{}114
users := map[string]store.User{}110
for _, p := range list {115
for _, p := range list {111
row := s.pipeRow(r, lang, repo, p, users)116
row := s.pipeRow(r, lang, repo, p, users, ranks)112
if q != "" && !pipeMatches(row, q) {117
if q != "" && !pipeMatches(row, q) {113
continue118
continue114
}119
}120
if rowLive(row) {121
v.Live = true122
}115
v.PipeRows = append(v.PipeRows, row)123
v.PipeRows = append(v.PipeRows, row)116
}124
}125
v.LiveURL = repoURL(repo) + "/-/pipelines"126
if raw := strings.TrimSpace(r.URL.Query().Get("q")); raw != "" {127
v.LiveURL += "?q=" + url.QueryEscape(raw)128
}129
}130
131
func rowLive(row PipeRow) bool {132
if row.Status == "pending" || row.Status == "running" {133
return true134
}135
for _, st := range row.Stages {136
if st.Status == "pending" || st.Status == "running" {137
return true138
}139
for _, j := range st.Jobs {140
if j.Status == "pending" || j.Status == "running" {141
return true142
}143
}144
}145
return false117
}146
}118
147
119
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User) PipeRow {148
func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p store.Pipeline, users map[string]store.User, ranks map[int64]int) PipeRow {120
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)149
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)121
name, kind := ci.SplitRef(p.Ref)150
name, kind := ci.SplitRef(p.Ref)122
status := displayStatus(p.Status, jobs)151
status := displayStatus(p.Status, jobs)@@ -138,7 +167,7 @@ func (s *Server) pipeRow(r *http.Request, lang i18n.Lang, repo store.Repo, p sto138
Duration: formatClock(end.Sub(start)), When: i18n.Ago(lang, p.CreatedAt.Unix()),167
Duration: formatClock(end.Sub(start)), When: i18n.Ago(lang, p.CreatedAt.Unix()),139
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),168
Title: p.CommitTitle, SHA: p.CommitSHA, Short: shortSHA(p.CommitSHA),140
Ref: name, RefKind: kind, Actor: actor, Avatar: avatar, Initial: initial,169
Ref: name, RefKind: kind, Actor: actor, Avatar: avatar, Initial: initial,141
Stages: stageViews(lang, jobs, func(key string) string { return s.tr(r, key) }),170
Stages: stageViews(jobs, ranks, func(key string, args ...any) string { return s.tr(r, key, args...) }),142
}171
}143
}172
}144
173
@@ -208,7 +237,7 @@ func displayStatus(pipe string, jobs []store.Job) string {208
return pipe237
return pipe209
}238
}210
239
211
func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []StageView {240
func stageViews(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []StageView {212
var order []string241
var order []string213
by := map[string][]store.Job{}242
by := map[string][]store.Job{}214
for _, j := range jobs {243
for _, j := range jobs {@@ -225,11 +254,13 @@ func stageViews(lang i18n.Lang, jobs []store.Job, tr func(string) string) []Stag225
var links []JobLink254
var links []JobLink226
for _, j := range group {255
for _, j := range group {227
st := jobDisplay(j)256
st := jobDisplay(j)228
links = append(links, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage})257
links = append(links, JobLink{258
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,259
Queue: queueText(tr, ranks, j.ID),260
})229
}261
}230
out = append(out, StageView{Name: name, Status: status, Label: label, Tip: name + ": " + strings.ToLower(label), Jobs: links})262
out = append(out, StageView{Name: name, Status: status, Label: label, Tip: name + ": " + strings.ToLower(label), Jobs: links})231
}263
}232
_ = lang233
return out264
return out234
}265
}235
266
@@ -354,11 +385,18 @@ func (s *Server) jobLog(w http.ResponseWriter, r *http.Request) {354
if offset < 0 || offset > len(job.Log) {385
if offset < 0 || offset > len(job.Log) {355
offset = 0386
offset = 0356
}387
}388
queue := ""389
if job.Status == "queued" {390
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }391
queue = queueText(tr, s.queueRanks(r.Context()), job.ID)392
}357
w.Header().Set("Content-Type", "application/json")393
w.Header().Set("Content-Type", "application/json")394
w.Header().Set("Cache-Control", "no-store")358
_ = json.NewEncoder(w).Encode(map[string]any{395
_ = json.NewEncoder(w).Encode(map[string]any{359
"offset": len(job.Log),396
"offset": len(job.Log),360
"status": job.Status,397
"status": job.Status,361
"text": job.Log[offset:],398
"text": job.Log[offset:],399
"queue": queue,362
})400
})363
}401
}364
402
@@ -438,6 +476,8 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job438
if !end.IsZero() {476
if !end.IsZero() {439
finished = i18n.Ago(lang, end.Unix())477
finished = i18n.Ago(lang, end.Unix())440
}478
}479
ranks := s.queueRanks(r.Context())480
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }441
var stages []string481
var stages []string442
seen := map[string]bool{}482
seen := map[string]bool{}443
var related []JobLink483
var related []JobLink@@ -447,7 +487,10 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job447
stages = append(stages, j.Stage)487
stages = append(stages, j.Stage)448
}488
}449
st := jobDisplay(j)489
st := jobDisplay(j)450
related = append(related, JobLink{ID: j.ID, Name: j.Name, Status: st, Label: s.tr(r, "pipe."+st), Current: j.ID == job.ID, Stage: j.Stage})490
related = append(related, JobLink{491
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Current: j.ID == job.ID, Stage: j.Stage,492
Queue: queueText(tr, ranks, j.ID),493
})451
}494
}452
sourceKey := "pipe.src." + p.Source495
sourceKey := "pipe.src." + p.Source453
source := s.tr(r, sourceKey)496
source := s.tr(r, sourceKey)@@ -462,6 +505,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job462
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),505
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),463
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",506
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",464
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),507
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),508
Queue: queueText(tr, ranks, job.ID),465
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),509
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),466
}510
}467
}511
}@@ -531,6 +575,114 @@ func parseLog(raw string) []LogBlock {531
return blocks575
return blocks532
}576
}533
577
578
func wantsJSON(r *http.Request) bool {579
return strings.Contains(r.Header.Get("Accept"), "application/json")580
}581
582
func jobsLive(pipe string, jobs []store.Job) bool {583
if pipe == "queued" || pipe == "running" {584
return true585
}586
for _, j := range jobs {587
if j.Status == "queued" || j.Status == "running" {588
return true589
}590
}591
return false592
}593
594
func linksFor(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) string) []JobLink {595
out := make([]JobLink, 0, len(jobs))596
for _, j := range jobs {597
st := jobDisplay(j)598
out = append(out, JobLink{599
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,600
Queue: queueText(tr, ranks, j.ID),601
})602
}603
return out604
}605
606
func (s *Server) partial(name string, v View) string {607
var buf bytes.Buffer608
tmpl := s.byLang[v.Lang]609
if tmpl == nil {610
tmpl = s.tmpl611
}612
if tmpl == nil {613
return ""614
}615
if err := tmpl.ExecuteTemplate(&buf, name, v); err != nil && s.Log != nil {616
s.Log.Error("sjabloon", "name", name, "err", err)617
}618
return buf.String()619
}620
621
func (s *Server) writePipeList(w http.ResponseWriter, v View) {622
type job struct {623
ID int64 `json:"id"`624
Name string `json:"name"`625
Status string `json:"status"`626
Label string `json:"label"`627
Queue string `json:"queue"`628
}629
type stage struct {630
Name string `json:"name"`631
Status string `json:"status"`632
Tip string `json:"tip"`633
Jobs []job `json:"jobs"`634
}635
type row struct {636
ID int64 `json:"id"`637
Status string `json:"status"`638
Label string `json:"label"`639
Duration string `json:"duration"`640
When string `json:"when"`641
Stages []stage `json:"stages"`642
HTML string `json:"html"`643
}644
rows := make([]row, 0, len(v.PipeRows))645
for _, pr := range v.PipeRows {646
one := v647
one.PipeRows = []PipeRow{pr}648
item := row{649
ID: pr.ID, Status: pr.Status, Label: pr.Label, Duration: pr.Duration, When: pr.When,650
HTML: s.partial("pipe-rows", one),651
}652
for _, st := range pr.Stages {653
jobs := make([]job, 0, len(st.Jobs))654
for _, j := range st.Jobs {655
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Queue: j.Queue})656
}657
item.Stages = append(item.Stages, stage{Name: st.Name, Status: st.Status, Tip: st.Tip, Jobs: jobs})658
}659
rows = append(rows, item)660
}661
w.Header().Set("Content-Type", "application/json")662
w.Header().Set("Cache-Control", "no-store")663
_ = json.NewEncoder(w).Encode(map[string]any{"active": v.Live, "rows": rows})664
}665
666
func (s *Server) writePipeDetail(w http.ResponseWriter, v View) {667
type job struct {668
ID int64 `json:"id"`669
Name string `json:"name"`670
Status string `json:"status"`671
Label string `json:"label"`672
Stage string `json:"stage"`673
Queue string `json:"queue"`674
}675
jobs := make([]job, 0, len(v.PipeJobs))676
for _, j := range v.PipeJobs {677
jobs = append(jobs, job{ID: j.ID, Name: j.Name, Status: j.Status, Label: j.Label, Stage: j.Stage, Queue: j.Queue})678
}679
w.Header().Set("Content-Type", "application/json")680
w.Header().Set("Cache-Control", "no-store")681
_ = json.NewEncoder(w).Encode(map[string]any{682
"active": v.Live, "status": v.PipeStatus, "label": v.PipeLabel, "jobs": jobs,683
})684
}685
534
func clockOf(ts string) string {686
func clockOf(ts string) string {535
if t, err := time.Parse(time.RFC3339, ts); err == nil {687
if t, err := time.Parse(time.RFC3339, ts); err == nil {536
return t.UTC().Format("15:04:05")688
return t.UTC().Format("15:04:05")@@ -0,0 +1,103 @@
1
package server
2
3
import (
4
"context"
5
"fmt"
6
7
"gitlab.com/Timfa/bluegit/internal/ci"
8
"gitlab.com/Timfa/bluegit/internal/store"
9
)
10
11
// pipeSnap is één pipeline in de volgorde waarin Steve jobs oppakt.
12
type pipeSnap struct {
13
Jobs []store.Job
14
}
15
16
// queueRanks geeft elke startklare queued job zijn plek in Steves
17
// globale wachtrij. ci.concurrency beperkt hoeveel jobs tegelijk
18
// running worden; die lopende jobs houden hun slot en krijgen geen
19
// nummer. De wachtenden blijven 1, 2, 3, … tot er een slot vrijkomt.
20
// Een job die nog op een voorganger of een resourcegroep wacht, heeft
21
// geen plek: Steve slaat die over.
22
func (s *Server) queueRanks(ctx context.Context) map[int64]int {
23
pipes, err := s.Store.ActivePipelines(ctx)
24
if err != nil {
25
return map[int64]int{}
26
}
27
snaps := make([]pipeSnap, 0, len(pipes))
28
for _, p := range pipes {
29
jobs, err := s.Store.JobsByPipeline(ctx, p.ID)
30
if err != nil {
31
continue
32
}
33
snaps = append(snaps, pipeSnap{Jobs: jobs})
34
}
35
return rankQueue(snaps)
36
}
37
38
func queueText(tr func(string, ...any) string, ranks map[int64]int, id int64) string {
39
if ranks == nil {
40
return ""
41
}
42
n := ranks[id]
43
if n < 1 {
44
return ""
45
}
46
return tr("pipe.queuePos", n)
47
}
48
49
// rankQueue nummert startklare jobs vanaf 1. Pipelines staan op id,
50
// jobs daarbinnen op positie. Jobs die al running zijn vullen een
51
// concurrency-slot en staan niet in de telling, zodat de eerstvolgende
52
// wachtende job #1 is, ook als Steve al vol zit.
53
func rankQueue(pipes []pipeSnap) map[int64]int {
54
busy := map[string]bool{}
55
for _, p := range pipes {
56
for _, j := range p.Jobs {
57
if j.Status == "running" && j.ResourceGroup != "" {
58
busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] = true
59
}
60
}
61
}
62
ranks := map[int64]int{}
63
n := 0
64
for _, p := range pipes {
65
specs, status := ciSpecs(p.Jobs)
66
for _, j := range p.Jobs {
67
if j.Status != "queued" {
68
continue
69
}
70
if j.ResourceGroup != "" && busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] {
71
continue
72
}
73
if ci.Gate(specs, status, specs[indexJob(p.Jobs, j.Name)]) != "ready" {
74
continue
75
}
76
n++
77
ranks[j.ID] = n
78
}
79
}
80
return ranks
81
}
82
83
func ciSpecs(jobs []store.Job) ([]ci.Job, map[string]string) {
84
specs := make([]ci.Job, len(jobs))
85
status := map[string]string{}
86
for i, j := range jobs {
87
specs[i] = ci.Job{
88
Name: j.Name, Stage: j.Stage, Needs: j.Needs, Optional: j.Optional,
89
NeedsSet: j.NeedsSet, AllowFailure: j.AllowFailure, When: j.When,
90
}
91
status[j.Name] = j.Status
92
}
93
return specs, status
94
}
95
96
func indexJob(jobs []store.Job, name string) int {
97
for i, j := range jobs {
98
if j.Name == name {
99
return i
100
}
101
}
102
return 0
103
}
@@ -0,0 +1,103 @@1
package server2
3
import (4
"context"5
"fmt"6
7
"gitlab.com/Timfa/bluegit/internal/ci"8
"gitlab.com/Timfa/bluegit/internal/store"9
)10
11
// pipeSnap is één pipeline in de volgorde waarin Steve jobs oppakt.12
type pipeSnap struct {13
Jobs []store.Job14
}15
16
// queueRanks geeft elke startklare queued job zijn plek in Steves17
// globale wachtrij. ci.concurrency beperkt hoeveel jobs tegelijk18
// running worden; die lopende jobs houden hun slot en krijgen geen19
// nummer. De wachtenden blijven 1, 2, 3, … tot er een slot vrijkomt.20
// Een job die nog op een voorganger of een resourcegroep wacht, heeft21
// geen plek: Steve slaat die over.22
func (s *Server) queueRanks(ctx context.Context) map[int64]int {23
pipes, err := s.Store.ActivePipelines(ctx)24
if err != nil {25
return map[int64]int{}26
}27
snaps := make([]pipeSnap, 0, len(pipes))28
for _, p := range pipes {29
jobs, err := s.Store.JobsByPipeline(ctx, p.ID)30
if err != nil {31
continue32
}33
snaps = append(snaps, pipeSnap{Jobs: jobs})34
}35
return rankQueue(snaps)36
}37
38
func queueText(tr func(string, ...any) string, ranks map[int64]int, id int64) string {39
if ranks == nil {40
return ""41
}42
n := ranks[id]43
if n < 1 {44
return ""45
}46
return tr("pipe.queuePos", n)47
}48
49
// rankQueue nummert startklare jobs vanaf 1. Pipelines staan op id,50
// jobs daarbinnen op positie. Jobs die al running zijn vullen een51
// concurrency-slot en staan niet in de telling, zodat de eerstvolgende52
// wachtende job #1 is, ook als Steve al vol zit.53
func rankQueue(pipes []pipeSnap) map[int64]int {54
busy := map[string]bool{}55
for _, p := range pipes {56
for _, j := range p.Jobs {57
if j.Status == "running" && j.ResourceGroup != "" {58
busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] = true59
}60
}61
}62
ranks := map[int64]int{}63
n := 064
for _, p := range pipes {65
specs, status := ciSpecs(p.Jobs)66
for _, j := range p.Jobs {67
if j.Status != "queued" {68
continue69
}70
if j.ResourceGroup != "" && busy[fmt.Sprintf("%d\t%s", j.RepoID, j.ResourceGroup)] {71
continue72
}73
if ci.Gate(specs, status, specs[indexJob(p.Jobs, j.Name)]) != "ready" {74
continue75
}76
n++77
ranks[j.ID] = n78
}79
}80
return ranks81
}82
83
func ciSpecs(jobs []store.Job) ([]ci.Job, map[string]string) {84
specs := make([]ci.Job, len(jobs))85
status := map[string]string{}86
for i, j := range jobs {87
specs[i] = ci.Job{88
Name: j.Name, Stage: j.Stage, Needs: j.Needs, Optional: j.Optional,89
NeedsSet: j.NeedsSet, AllowFailure: j.AllowFailure, When: j.When,90
}91
status[j.Name] = j.Status92
}93
return specs, status94
}95
96
func indexJob(jobs []store.Job, name string) int {97
for i, j := range jobs {98
if j.Name == name {99
return i100
}101
}102
return 0103
}@@ -0,0 +1,166 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"path/filepath"
9
"strconv"
10
"strings"
11
"testing"
12
13
"gitlab.com/Timfa/bluegit/internal/auth"
14
"gitlab.com/Timfa/bluegit/internal/config"
15
"gitlab.com/Timfa/bluegit/internal/store"
16
)
17
18
func TestRankQueueSkipsWaitersAndRunning(t *testing.T) {
19
first := pipeSnap{Jobs: []store.Job{
20
{ID: 1, Name: "lint", Stage: "test", Status: "queued", Position: 0},
21
{ID: 2, Name: "unit", Stage: "test", Status: "queued", Position: 1},
22
{ID: 3, Name: "ship", Stage: "deploy", Status: "queued", Position: 2},
23
}}
24
ranks := rankQueue([]pipeSnap{first})
25
if ranks[1] != 1 || ranks[2] != 2 || ranks[3] != 0 {
26
t.Fatalf("zelfde stage vóór deploy: %#v", ranks)
27
}
28
busy := []pipeSnap{{Jobs: []store.Job{
29
{ID: 10, RepoID: 1, Name: "hold", Stage: "test", Status: "running", ResourceGroup: "db"},
30
{ID: 11, RepoID: 1, Name: "wait", Stage: "test", Status: "queued", ResourceGroup: "db"},
31
{ID: 12, RepoID: 1, Name: "other", Stage: "test", Status: "queued"},
32
}}}
33
ranks = rankQueue(busy)
34
if ranks[10] != 0 || ranks[11] != 0 || ranks[12] != 1 {
35
t.Fatalf("running vult een slot, resourcegroep telt niet mee: %#v", ranks)
36
}
37
later := rankQueue([]pipeSnap{
38
{Jobs: []store.Job{{ID: 4, Name: "old", Stage: "test", Status: "queued"}}},
39
{Jobs: []store.Job{{ID: 5, Name: "new", Stage: "test", Status: "queued"}}},
40
})
41
if later[4] != 1 || later[5] != 2 {
42
t.Fatalf("oudere pipeline eerst: %#v", later)
43
}
44
}
45
46
func TestPipelineLiveQueue(t *testing.T) {
47
storage := t.TempDir()
48
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
49
if err != nil {
50
t.Fatal(err)
51
}
52
t.Cleanup(func() { _ = st.Close() })
53
cfg := config.Config{
54
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
55
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
56
Git: config.Git{Binary: "git", DefaultBranch: "master"},
57
CI: config.CI{Concurrency: 1},
58
}
59
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git"}
60
ts := httptest.NewServer(srv.Handler())
61
t.Cleanup(ts.Close)
62
jar, _ := cookiejar.New(nil)
63
client := &http.Client{Jar: jar}
64
res, err := client.Get(ts.URL + "/login")
65
if err != nil {
66
t.Fatal(err)
67
}
68
_ = res.Body.Close()
69
ctx := context.Background()
70
user, err := st.UserByUsername(ctx, "tim")
71
if err != nil {
72
t.Fatal(err)
73
}
74
repo, err := st.CreateRepo(ctx, "user", user.ID, "demo", "", "master", "private")
75
if err != nil {
76
t.Fatal(err)
77
}
78
sha := "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"
79
id, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "tim", "wachtrij", []store.NewJob{
80
{Name: "lint", Stage: "test", Script: "exit 0"},
81
{Name: "unit", Stage: "test", Script: "exit 0"},
82
{Name: "ship", Stage: "deploy", Script: "exit 0"},
83
})
84
if err != nil {
85
t.Fatal(err)
86
}
87
jobs, err := st.JobsByPipeline(ctx, id)
88
if err != nil {
89
t.Fatal(err)
90
}
91
var lint, unit int64
92
for _, j := range jobs {
93
switch j.Name {
94
case "lint":
95
lint = j.ID
96
case "unit":
97
unit = j.ID
98
}
99
}
100
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines")
101
if err != nil {
102
t.Fatal(err)
103
}
104
page := read(t, res)
105
for _, want := range []string{
106
"In queue (#1)", "In queue (#2)", `data-live-on="1"`, `data-pipe="` + strconv.FormatInt(id, 10) + `"`,
107
} {
108
if !strings.Contains(page, want) {
109
t.Errorf("lijst mist %q", want)
110
}
111
}
112
if strings.Contains(page, "In queue (#3)") {
113
t.Fatal("deploy wacht op test en hoort geen plek te hebben")
114
}
115
req, _ := http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)
116
req.Header.Set("Accept", "application/json")
117
res, err = client.Do(req)
118
if err != nil {
119
t.Fatal(err)
120
}
121
body := read(t, res)
122
if !strings.Contains(body, `"active":true`) || !strings.Contains(body, `"queue":"In queue (#2)"`) {
123
t.Fatalf("live json:\n%s", body)
124
}
125
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10))
126
if err != nil {
127
t.Fatal(err)
128
}
129
detail := read(t, res)
130
if !strings.Contains(detail, "In queue (#1)") || !strings.Contains(detail, `data-live-on="1"`) {
131
t.Fatalf("detail:\n%s", detail)
132
}
133
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(lint, 10))
134
if err != nil {
135
t.Fatal(err)
136
}
137
jobPage := read(t, res)
138
if !strings.Contains(jobPage, "In queue (#1)") {
139
t.Fatalf("job:\n%s", jobPage)
140
}
141
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(unit, 10))
142
if err != nil {
143
t.Fatal(err)
144
}
145
if unitPage := read(t, res); !strings.Contains(unitPage, "In queue (#2)") {
146
t.Fatalf("tweede job:\n%s", unitPage)
147
}
148
for _, j := range jobs {
149
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {
150
t.Fatal(err)
151
}
152
}
153
if _, err := st.RefreshPipelineStatus(ctx, id); err != nil {
154
t.Fatal(err)
155
}
156
req, _ = http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)
157
req.Header.Set("Accept", "application/json")
158
res, err = client.Do(req)
159
if err != nil {
160
t.Fatal(err)
161
}
162
done := read(t, res)
163
if !strings.Contains(done, `"active":false`) || strings.Contains(done, "In queue") {
164
t.Fatalf("stilgevallen:\n%s", done)
165
}
166
}
@@ -0,0 +1,166 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"path/filepath"9
"strconv"10
"strings"11
"testing"12
13
"gitlab.com/Timfa/bluegit/internal/auth"14
"gitlab.com/Timfa/bluegit/internal/config"15
"gitlab.com/Timfa/bluegit/internal/store"16
)17
18
func TestRankQueueSkipsWaitersAndRunning(t *testing.T) {19
first := pipeSnap{Jobs: []store.Job{20
{ID: 1, Name: "lint", Stage: "test", Status: "queued", Position: 0},21
{ID: 2, Name: "unit", Stage: "test", Status: "queued", Position: 1},22
{ID: 3, Name: "ship", Stage: "deploy", Status: "queued", Position: 2},23
}}24
ranks := rankQueue([]pipeSnap{first})25
if ranks[1] != 1 || ranks[2] != 2 || ranks[3] != 0 {26
t.Fatalf("zelfde stage vóór deploy: %#v", ranks)27
}28
busy := []pipeSnap{{Jobs: []store.Job{29
{ID: 10, RepoID: 1, Name: "hold", Stage: "test", Status: "running", ResourceGroup: "db"},30
{ID: 11, RepoID: 1, Name: "wait", Stage: "test", Status: "queued", ResourceGroup: "db"},31
{ID: 12, RepoID: 1, Name: "other", Stage: "test", Status: "queued"},32
}}}33
ranks = rankQueue(busy)34
if ranks[10] != 0 || ranks[11] != 0 || ranks[12] != 1 {35
t.Fatalf("running vult een slot, resourcegroep telt niet mee: %#v", ranks)36
}37
later := rankQueue([]pipeSnap{38
{Jobs: []store.Job{{ID: 4, Name: "old", Stage: "test", Status: "queued"}}},39
{Jobs: []store.Job{{ID: 5, Name: "new", Stage: "test", Status: "queued"}}},40
})41
if later[4] != 1 || later[5] != 2 {42
t.Fatalf("oudere pipeline eerst: %#v", later)43
}44
}45
46
func TestPipelineLiveQueue(t *testing.T) {47
storage := t.TempDir()48
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())49
if err != nil {50
t.Fatal(err)51
}52
t.Cleanup(func() { _ = st.Close() })53
cfg := config.Config{54
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,55
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},56
Git: config.Git{Binary: "git", DefaultBranch: "master"},57
CI: config.CI{Concurrency: 1},58
}59
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git"}60
ts := httptest.NewServer(srv.Handler())61
t.Cleanup(ts.Close)62
jar, _ := cookiejar.New(nil)63
client := &http.Client{Jar: jar}64
res, err := client.Get(ts.URL + "/login")65
if err != nil {66
t.Fatal(err)67
}68
_ = res.Body.Close()69
ctx := context.Background()70
user, err := st.UserByUsername(ctx, "tim")71
if err != nil {72
t.Fatal(err)73
}74
repo, err := st.CreateRepo(ctx, "user", user.ID, "demo", "", "master", "private")75
if err != nil {76
t.Fatal(err)77
}78
sha := "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"79
id, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "tim", "wachtrij", []store.NewJob{80
{Name: "lint", Stage: "test", Script: "exit 0"},81
{Name: "unit", Stage: "test", Script: "exit 0"},82
{Name: "ship", Stage: "deploy", Script: "exit 0"},83
})84
if err != nil {85
t.Fatal(err)86
}87
jobs, err := st.JobsByPipeline(ctx, id)88
if err != nil {89
t.Fatal(err)90
}91
var lint, unit int6492
for _, j := range jobs {93
switch j.Name {94
case "lint":95
lint = j.ID96
case "unit":97
unit = j.ID98
}99
}100
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines")101
if err != nil {102
t.Fatal(err)103
}104
page := read(t, res)105
for _, want := range []string{106
"In queue (#1)", "In queue (#2)", `data-live-on="1"`, `data-pipe="` + strconv.FormatInt(id, 10) + `"`,107
} {108
if !strings.Contains(page, want) {109
t.Errorf("lijst mist %q", want)110
}111
}112
if strings.Contains(page, "In queue (#3)") {113
t.Fatal("deploy wacht op test en hoort geen plek te hebben")114
}115
req, _ := http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)116
req.Header.Set("Accept", "application/json")117
res, err = client.Do(req)118
if err != nil {119
t.Fatal(err)120
}121
body := read(t, res)122
if !strings.Contains(body, `"active":true`) || !strings.Contains(body, `"queue":"In queue (#2)"`) {123
t.Fatalf("live json:\n%s", body)124
}125
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10))126
if err != nil {127
t.Fatal(err)128
}129
detail := read(t, res)130
if !strings.Contains(detail, "In queue (#1)") || !strings.Contains(detail, `data-live-on="1"`) {131
t.Fatalf("detail:\n%s", detail)132
}133
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(lint, 10))134
if err != nil {135
t.Fatal(err)136
}137
jobPage := read(t, res)138
if !strings.Contains(jobPage, "In queue (#1)") {139
t.Fatalf("job:\n%s", jobPage)140
}141
res, err = client.Get(ts.URL + "/tim/demo/-/pipelines/" + strconv.FormatInt(id, 10) + "/jobs/" + strconv.FormatInt(unit, 10))142
if err != nil {143
t.Fatal(err)144
}145
if unitPage := read(t, res); !strings.Contains(unitPage, "In queue (#2)") {146
t.Fatalf("tweede job:\n%s", unitPage)147
}148
for _, j := range jobs {149
if err := st.FinishJob(ctx, j.ID, "success", ""); err != nil {150
t.Fatal(err)151
}152
}153
if _, err := st.RefreshPipelineStatus(ctx, id); err != nil {154
t.Fatal(err)155
}156
req, _ = http.NewRequest(http.MethodGet, ts.URL+"/tim/demo/-/pipelines", nil)157
req.Header.Set("Accept", "application/json")158
res, err = client.Do(req)159
if err != nil {160
t.Fatal(err)161
}162
done := read(t, res)163
if !strings.Contains(done, `"active":false`) || strings.Contains(done, "In queue") {164
t.Fatalf("stilgevallen:\n%s", done)165
}166
}@@ -388,6 +388,10 @@ func (s *Server) pipelines(w http.ResponseWriter, r *http.Request) {
388
388
v.Wide = true
389
389
v.Page = "pipelines"
390
390
s.fillPipelines(r, &v, repo)
391
if wantsJSON(r) {
392
s.writePipeList(w, v)
393
return
394
}
391
395
s.render(w, "pipelines", v)
392
396
}
393
397
@@ -410,7 +414,19 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {
410
414
v.Wide = true
411
415
v.Page = "pipelines"
412
416
v.Pipe = &p
413
v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)
417
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)
418
v.Jobs = jobs
419
ranks := s.queueRanks(r.Context())
420
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
421
v.PipeStatus = displayStatus(p.Status, jobs)
422
v.PipeLabel = tr("pipe." + v.PipeStatus)
423
v.PipeJobs = linksFor(jobs, ranks, tr)
424
v.Live = jobsLive(p.Status, jobs)
425
v.LiveURL = repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10)
426
if wantsJSON(r) {
427
s.writePipeDetail(w, v)
428
return
429
}
414
430
s.render(w, "pipeline", v)
415
431
}
416
432
@@ -388,6 +388,10 @@ func (s *Server) pipelines(w http.ResponseWriter, r *http.Request) {388
v.Wide = true388
v.Wide = true389
v.Page = "pipelines"389
v.Page = "pipelines"390
s.fillPipelines(r, &v, repo)390
s.fillPipelines(r, &v, repo)391
if wantsJSON(r) {392
s.writePipeList(w, v)393
return394
}391
s.render(w, "pipelines", v)395
s.render(w, "pipelines", v)392
}396
}393
397
@@ -410,7 +414,19 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {410
v.Wide = true414
v.Wide = true411
v.Page = "pipelines"415
v.Page = "pipelines"412
v.Pipe = &p416
v.Pipe = &p413
v.Jobs, _ = s.Store.JobsByPipeline(r.Context(), p.ID)417
jobs, _ := s.Store.JobsByPipeline(r.Context(), p.ID)418
v.Jobs = jobs419
ranks := s.queueRanks(r.Context())420
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }421
v.PipeStatus = displayStatus(p.Status, jobs)422
v.PipeLabel = tr("pipe." + v.PipeStatus)423
v.PipeJobs = linksFor(jobs, ranks, tr)424
v.Live = jobsLive(p.Status, jobs)425
v.LiveURL = repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10)426
if wantsJSON(r) {427
s.writePipeDetail(w, v)428
return429
}414
s.render(w, "pipeline", v)430
s.render(w, "pipeline", v)415
}431
}416
432
@@ -470,6 +470,11 @@ type View struct {
470
470
Pipes []store.Pipeline
471
471
PipeRows []PipeRow
472
472
Pipe *store.Pipeline
473
PipeStatus string
474
PipeLabel string
475
PipeJobs []JobLink
476
Live bool
477
LiveURL string
473
478
Jobs []store.Job
474
479
JobPage *JobPage
475
480
Editor *CIEditor
@@ -470,6 +470,11 @@ type View struct {470
Pipes []store.Pipeline470
Pipes []store.Pipeline471
PipeRows []PipeRow471
PipeRows []PipeRow472
Pipe *store.Pipeline472
Pipe *store.Pipeline473
PipeStatus string474
PipeLabel string475
PipeJobs []JobLink476
Live bool477
LiveURL string473
Jobs []store.Job478
Jobs []store.Job474
JobPage *JobPage479
JobPage *JobPage475
Editor *CIEditor480
Editor *CIEditor@@ -109,6 +109,237 @@
109
109
});
110
110
}
111
111
112
function rowElement(html) {
113
var wrap = document.createElement("tbody");
114
wrap.innerHTML = (html || "").trim();
115
return wrap.querySelector("tr");
116
}
117
118
function findStage(root, name) {
119
var buttons = root.querySelectorAll("button.stage-dot[data-stage]");
120
for (var i = 0; i < buttons.length; i++) {
121
if (buttons[i].getAttribute("data-stage") === name) {
122
return buttons[i];
123
}
124
}
125
return null;
126
}
127
128
function setQueue(root, text) {
129
var q = root.querySelector("[data-queue]");
130
if (!text) {
131
if (q) {
132
q.remove();
133
}
134
return;
135
}
136
if (!q) {
137
q = document.createElement("span");
138
q.className = "queue";
139
q.setAttribute("data-queue", "");
140
var anchor = root.querySelector("a");
141
if (anchor && anchor.parentElement === root) {
142
anchor.insertAdjacentElement("afterend", q);
143
} else {
144
(anchor || root).appendChild(q);
145
}
146
}
147
q.textContent = text;
148
}
149
150
function patchPipeRow(live, row) {
151
var status = live.querySelector("[data-pipe-status]");
152
if (status) {
153
status.className = "status " + row.status;
154
var label = status.querySelector("[data-pipe-label]");
155
if (label) {
156
label.textContent = row.label || "";
157
}
158
}
159
var dur = live.querySelector("[data-pipe-duration]");
160
if (dur) {
161
dur.textContent = row.duration || "";
162
}
163
var when = live.querySelector("[data-pipe-when]");
164
if (when) {
165
when.textContent = row.when || "";
166
}
167
var stages = live.querySelector(".stages");
168
if (!stages) {
169
return;
170
}
171
var buttons = stages.querySelectorAll(":scope > .stage > button.stage-dot[data-stage]");
172
var next = row.stages || [];
173
var same = buttons.length === next.length;
174
for (var i = 0; same && i < buttons.length; i++) {
175
if (buttons[i].getAttribute("data-stage") !== next[i].name) {
176
same = false;
177
}
178
}
179
if (!same) {
180
var fresh = rowElement(row.html);
181
if (!fresh) {
182
return;
183
}
184
var openName = "";
185
var openPop = live.querySelector(".stage-pop:popover-open");
186
if (openPop) {
187
var openBtn = openPop.parentElement.querySelector("button.stage-dot");
188
openName = openBtn ? openBtn.getAttribute("data-stage") : "";
189
}
190
stages.innerHTML = fresh.querySelector(".stages").innerHTML;
191
if (openName) {
192
var again = findStage(live, openName);
193
if (again) {
194
again.click();
195
}
196
}
197
return;
198
}
199
next.forEach(function (st) {
200
var btn = findStage(live, st.name);
201
if (!btn) {
202
return;
203
}
204
btn.className = "stage-dot " + st.status;
205
btn.setAttribute("data-tip", st.tip || "");
206
btn.setAttribute("aria-label", st.tip || "");
207
var pop = btn.parentElement.querySelector(".stage-pop");
208
if (!pop) {
209
return;
210
}
211
(st.jobs || []).forEach(function (job) {
212
var li = pop.querySelector('[data-job="' + job.id + '"]');
213
if (!li) {
214
return;
215
}
216
var dot = li.querySelector(".stage-dot");
217
if (dot) {
218
dot.className = "stage-dot sm " + job.status;
219
}
220
setQueue(li, job.queue);
221
});
222
});
223
}
224
225
function applyPipeRows(rows, scrollX, scrollY, box, left) {
226
var body = document.querySelector("table.pipes tbody");
227
if (!body) {
228
return;
229
}
230
var ids = {};
231
rows.forEach(function (row) {
232
ids[String(row.id)] = true;
233
});
234
body.querySelectorAll("tr[data-pipe]").forEach(function (tr) {
235
if (ids[tr.getAttribute("data-pipe")]) {
236
return;
237
}
238
var rect = tr.getBoundingClientRect();
239
var h = tr.offsetHeight;
240
tr.remove();
241
if (rect.bottom <= 0) {
242
scrollY -= h;
243
}
244
});
245
rows.forEach(function (row, index) {
246
var live = body.querySelector('tr[data-pipe="' + row.id + '"]');
247
if (!live) {
248
var fresh = rowElement(row.html);
249
if (!fresh) {
250
return;
251
}
252
var existing = body.querySelectorAll("tr[data-pipe]");
253
var before = existing[index] || null;
254
if (before) {
255
body.insertBefore(fresh, before);
256
} else {
257
body.appendChild(fresh);
258
}
259
if (scrollY > 0) {
260
scrollY += fresh.offsetHeight;
261
}
262
return;
263
}
264
patchPipeRow(live, row);
265
var existing = body.querySelectorAll("tr[data-pipe]");
266
if (existing[index] && existing[index] !== live) {
267
body.insertBefore(live, existing[index]);
268
}
269
});
270
window.scrollTo(scrollX, scrollY);
271
if (box) {
272
box.scrollLeft = left;
273
}
274
}
275
276
function applyDetail(data) {
277
var pill = document.querySelector("[data-pipe-status]");
278
if (pill && data.status) {
279
pill.className = "status " + data.status;
280
var label = pill.querySelector("[data-pipe-label]");
281
if (label) {
282
label.textContent = data.label || "";
283
}
284
}
285
(data.jobs || []).forEach(function (job) {
286
var li = document.querySelector('.clean li[data-job="' + job.id + '"]');
287
if (!li) {
288
return;
289
}
290
var st = li.querySelector("[data-job-status]");
291
if (st) {
292
st.className = "status " + job.status;
293
var lab = st.querySelector("[data-job-label]");
294
if (lab) {
295
lab.textContent = job.label || "";
296
}
297
}
298
setQueue(li, job.queue);
299
});
300
}
301
302
var liveEl = document.querySelector("[data-live-on]");
303
if (liveEl) {
304
var liveURL = liveEl.getAttribute("data-live");
305
var liveTimer = function () {
306
if (document.hidden) {
307
setTimeout(liveTimer, 3000);
308
return;
309
}
310
var box = document.querySelector(".hscroll");
311
var scrollX = window.scrollX;
312
var scrollY = window.scrollY;
313
var left = box ? box.scrollLeft : 0;
314
fetch(liveURL, { headers: { Accept: "application/json" }, credentials: "same-origin", cache: "no-store" })
315
.then(function (res) {
316
if (!res.ok) {
317
throw new Error("live");
318
}
319
return res.json();
320
})
321
.then(function (data) {
322
if (data.rows) {
323
applyPipeRows(data.rows, scrollX, scrollY, box, left);
324
} else {
325
applyDetail(data);
326
window.scrollTo(scrollX, scrollY);
327
if (box) {
328
box.scrollLeft = left;
329
}
330
}
331
window.dispatchEvent(new Event("resize"));
332
if (data.active) {
333
setTimeout(liveTimer, 3000);
334
}
335
})
336
.catch(function () {
337
setTimeout(liveTimer, 3000);
338
});
339
};
340
setTimeout(liveTimer, 3000);
341
}
342
112
343
if (!wrapBox || wrapBox.getAttribute("data-running") !== "1" || !log) {
113
344
return;
114
345
}
@@ -330,6 +561,11 @@
330
561
}
331
562
});
332
563
offset = data.offset || offset;
564
var qEl = document.querySelector(".jobhead [data-queue]");
565
if (qEl) {
566
qEl.textContent = data.queue || "";
567
qEl.hidden = !data.queue;
568
}
333
569
if (data.status === "running" || data.status === "queued") {
334
570
setTimeout(poll, 1500);
335
571
return;
@@ -109,6 +109,237 @@109
});109
});110
}110
}111
111
112
function rowElement(html) {113
var wrap = document.createElement("tbody");114
wrap.innerHTML = (html || "").trim();115
return wrap.querySelector("tr");116
}117
118
function findStage(root, name) {119
var buttons = root.querySelectorAll("button.stage-dot[data-stage]");120
for (var i = 0; i < buttons.length; i++) {121
if (buttons[i].getAttribute("data-stage") === name) {122
return buttons[i];123
}124
}125
return null;126
}127
128
function setQueue(root, text) {129
var q = root.querySelector("[data-queue]");130
if (!text) {131
if (q) {132
q.remove();133
}134
return;135
}136
if (!q) {137
q = document.createElement("span");138
q.className = "queue";139
q.setAttribute("data-queue", "");140
var anchor = root.querySelector("a");141
if (anchor && anchor.parentElement === root) {142
anchor.insertAdjacentElement("afterend", q);143
} else {144
(anchor || root).appendChild(q);145
}146
}147
q.textContent = text;148
}149
150
function patchPipeRow(live, row) {151
var status = live.querySelector("[data-pipe-status]");152
if (status) {153
status.className = "status " + row.status;154
var label = status.querySelector("[data-pipe-label]");155
if (label) {156
label.textContent = row.label || "";157
}158
}159
var dur = live.querySelector("[data-pipe-duration]");160
if (dur) {161
dur.textContent = row.duration || "";162
}163
var when = live.querySelector("[data-pipe-when]");164
if (when) {165
when.textContent = row.when || "";166
}167
var stages = live.querySelector(".stages");168
if (!stages) {169
return;170
}171
var buttons = stages.querySelectorAll(":scope > .stage > button.stage-dot[data-stage]");172
var next = row.stages || [];173
var same = buttons.length === next.length;174
for (var i = 0; same && i < buttons.length; i++) {175
if (buttons[i].getAttribute("data-stage") !== next[i].name) {176
same = false;177
}178
}179
if (!same) {180
var fresh = rowElement(row.html);181
if (!fresh) {182
return;183
}184
var openName = "";185
var openPop = live.querySelector(".stage-pop:popover-open");186
if (openPop) {187
var openBtn = openPop.parentElement.querySelector("button.stage-dot");188
openName = openBtn ? openBtn.getAttribute("data-stage") : "";189
}190
stages.innerHTML = fresh.querySelector(".stages").innerHTML;191
if (openName) {192
var again = findStage(live, openName);193
if (again) {194
again.click();195
}196
}197
return;198
}199
next.forEach(function (st) {200
var btn = findStage(live, st.name);201
if (!btn) {202
return;203
}204
btn.className = "stage-dot " + st.status;205
btn.setAttribute("data-tip", st.tip || "");206
btn.setAttribute("aria-label", st.tip || "");207
var pop = btn.parentElement.querySelector(".stage-pop");208
if (!pop) {209
return;210
}211
(st.jobs || []).forEach(function (job) {212
var li = pop.querySelector('[data-job="' + job.id + '"]');213
if (!li) {214
return;215
}216
var dot = li.querySelector(".stage-dot");217
if (dot) {218
dot.className = "stage-dot sm " + job.status;219
}220
setQueue(li, job.queue);221
});222
});223
}224
225
function applyPipeRows(rows, scrollX, scrollY, box, left) {226
var body = document.querySelector("table.pipes tbody");227
if (!body) {228
return;229
}230
var ids = {};231
rows.forEach(function (row) {232
ids[String(row.id)] = true;233
});234
body.querySelectorAll("tr[data-pipe]").forEach(function (tr) {235
if (ids[tr.getAttribute("data-pipe")]) {236
return;237
}238
var rect = tr.getBoundingClientRect();239
var h = tr.offsetHeight;240
tr.remove();241
if (rect.bottom <= 0) {242
scrollY -= h;243
}244
});245
rows.forEach(function (row, index) {246
var live = body.querySelector('tr[data-pipe="' + row.id + '"]');247
if (!live) {248
var fresh = rowElement(row.html);249
if (!fresh) {250
return;251
}252
var existing = body.querySelectorAll("tr[data-pipe]");253
var before = existing[index] || null;254
if (before) {255
body.insertBefore(fresh, before);256
} else {257
body.appendChild(fresh);258
}259
if (scrollY > 0) {260
scrollY += fresh.offsetHeight;261
}262
return;263
}264
patchPipeRow(live, row);265
var existing = body.querySelectorAll("tr[data-pipe]");266
if (existing[index] && existing[index] !== live) {267
body.insertBefore(live, existing[index]);268
}269
});270
window.scrollTo(scrollX, scrollY);271
if (box) {272
box.scrollLeft = left;273
}274
}275
276
function applyDetail(data) {277
var pill = document.querySelector("[data-pipe-status]");278
if (pill && data.status) {279
pill.className = "status " + data.status;280
var label = pill.querySelector("[data-pipe-label]");281
if (label) {282
label.textContent = data.label || "";283
}284
}285
(data.jobs || []).forEach(function (job) {286
var li = document.querySelector('.clean li[data-job="' + job.id + '"]');287
if (!li) {288
return;289
}290
var st = li.querySelector("[data-job-status]");291
if (st) {292
st.className = "status " + job.status;293
var lab = st.querySelector("[data-job-label]");294
if (lab) {295
lab.textContent = job.label || "";296
}297
}298
setQueue(li, job.queue);299
});300
}301
302
var liveEl = document.querySelector("[data-live-on]");303
if (liveEl) {304
var liveURL = liveEl.getAttribute("data-live");305
var liveTimer = function () {306
if (document.hidden) {307
setTimeout(liveTimer, 3000);308
return;309
}310
var box = document.querySelector(".hscroll");311
var scrollX = window.scrollX;312
var scrollY = window.scrollY;313
var left = box ? box.scrollLeft : 0;314
fetch(liveURL, { headers: { Accept: "application/json" }, credentials: "same-origin", cache: "no-store" })315
.then(function (res) {316
if (!res.ok) {317
throw new Error("live");318
}319
return res.json();320
})321
.then(function (data) {322
if (data.rows) {323
applyPipeRows(data.rows, scrollX, scrollY, box, left);324
} else {325
applyDetail(data);326
window.scrollTo(scrollX, scrollY);327
if (box) {328
box.scrollLeft = left;329
}330
}331
window.dispatchEvent(new Event("resize"));332
if (data.active) {333
setTimeout(liveTimer, 3000);334
}335
})336
.catch(function () {337
setTimeout(liveTimer, 3000);338
});339
};340
setTimeout(liveTimer, 3000);341
}342
112
if (!wrapBox || wrapBox.getAttribute("data-running") !== "1" || !log) {343
if (!wrapBox || wrapBox.getAttribute("data-running") !== "1" || !log) {113
return;344
return;114
}345
}@@ -330,6 +561,11 @@330
}561
}331
});562
});332
offset = data.offset || offset;563
offset = data.offset || offset;564
var qEl = document.querySelector(".jobhead [data-queue]");565
if (qEl) {566
qEl.textContent = data.queue || "";567
qEl.hidden = !data.queue;568
}333
if (data.status === "running" || data.status === "queued") {569
if (data.status === "running" || data.status === "queued") {334
setTimeout(poll, 1500);570
setTimeout(poll, 1500);335
return;571
return;@@ -502,6 +502,7 @@ button.stage-dot {
502
502
}
503
503
.stage-pop ul { list-style: none; margin: 0.35rem 0 0; padding: 0; }
504
504
.stage-pop a, .related a { display: flex; align-items: center; gap: 0.4rem; text-decoration: none; padding: 0.22rem 0; color: var(--ink); }
505
.queue { color: var(--muted); font-weight: 500; }
505
506
.stage-dot.sm { width: 16px; height: 16px; display: inline-grid; place-items: center; }
506
507
.stage-dot.sm .mark { width: 14px; height: 14px; }
507
508
.stage-dot.sm.passed .mark::after { left: 4px; top: 2px; width: 3px; height: 6px; }
@@ -502,6 +502,7 @@ button.stage-dot {502
}502
}503
.stage-pop ul { list-style: none; margin: 0.35rem 0 0; padding: 0; }503
.stage-pop ul { list-style: none; margin: 0.35rem 0 0; padding: 0; }504
.stage-pop a, .related a { display: flex; align-items: center; gap: 0.4rem; text-decoration: none; padding: 0.22rem 0; color: var(--ink); }504
.stage-pop a, .related a { display: flex; align-items: center; gap: 0.4rem; text-decoration: none; padding: 0.22rem 0; color: var(--ink); }505
.queue { color: var(--muted); font-weight: 500; }505
.stage-dot.sm { width: 16px; height: 16px; display: inline-grid; place-items: center; }506
.stage-dot.sm { width: 16px; height: 16px; display: inline-grid; place-items: center; }506
.stage-dot.sm .mark { width: 14px; height: 14px; }507
.stage-dot.sm .mark { width: 14px; height: 14px; }507
.stage-dot.sm.passed .mark::after { left: 4px; top: 2px; width: 3px; height: 6px; }508
.stage-dot.sm.passed .mark::after { left: 4px; top: 2px; width: 3px; height: 6px; }@@ -32,11 +32,11 @@
32
32
<div class="stages">
33
33
{{range $pipe.Stages}}
34
34
<span class="stage">
35
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
35
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
36
36
<div class="stage-pop" popover="manual">
37
37
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>
38
38
<ul>
39
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}
39
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
40
40
</ul>
41
41
</div>
42
42
</span>
@@ -185,45 +185,12 @@
185
185
<button type="submit">{{t "action.start"}}</button>
186
186
</form>
187
187
{{end}}
188
<div class="hscroll">
188
<div class="hscroll"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
189
189
<table class="pipes">
190
190
<thead><tr><th>{{t "pipe.col.status"}}</th><th>{{t "pipe.col.pipeline"}}</th><th>{{t "pipe.col.by"}}</th><th>{{t "pipe.col.stages"}}</th></tr></thead>
191
191
<tbody>
192
{{range .PipeRows}}
193
{{$pipe := .}}
194
<tr>
195
<td>
196
<span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span>
197
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> {{.Duration}}</div>
198
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> {{.When}}</div>
199
</td>
200
<td>
201
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>
202
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}
203
<div class="chips">
204
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
205
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
206
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
207
</div>
208
</td>
209
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
210
<td>
211
<div class="stages">
212
{{range .Stages}}
213
<span class="stage">
214
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
215
<div class="stage-pop" popover="manual">
216
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>
217
<ul>
218
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}
219
</ul>
220
</div>
221
</span>
222
{{end}}
223
</div>
224
</td>
225
</tr>
226
{{else}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}
192
{{template "pipe-rows" .}}
193
{{if not .PipeRows}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}
227
194
</tbody>
228
195
</table>
229
196
</div>
@@ -236,21 +203,60 @@
236
203
{{template "layout-start" .}}
237
204
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>
238
205
{{template "pipenav" .}}
239
<p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>
206
<p><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>
240
207
<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>
241
<ul class="clean">
242
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Stage}}</span></li>{{end}}
208
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
209
{{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}
243
210
</ul>
211
<script src="/assets/pipeline.js"></script>
244
212
{{template "layout-end" .}}
245
213
{{end}}
246
214
215
{{define "pipe-rows"}}
216
{{range .PipeRows}}
217
{{$pipe := .}}
218
<tr data-pipe="{{.ID}}">
219
<td>
220
<span class="status {{.Status}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.Label}}</span></span>
221
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> <span data-pipe-duration>{{.Duration}}</span></div>
222
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> <span data-pipe-when>{{.When}}</span></div>
223
</td>
224
<td>
225
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>
226
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}
227
<div class="chips">
228
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}
229
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}
230
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}
231
</div>
232
</td>
233
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>
234
<td>
235
<div class="stages">
236
{{range .Stages}}
237
<span class="stage">
238
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>
239
<div class="stage-pop" popover="manual">
240
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>
241
<ul>
242
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
243
</ul>
244
</div>
245
</span>
246
{{end}}
247
</div>
248
</td>
249
</tr>
250
{{end}}
251
{{end}}
252
247
253
{{define "job"}}
248
254
{{template "layout-start" .}}
249
255
<header class="pagehead"><h1>{{with .JobPage}}{{.Name}}{{end}}</h1></header>
250
256
{{template "pipenav" $}}
251
257
{{with .JobPage}}
252
258
{{$page := .}}
253
<p class="jobhead"><span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span> <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>
259
<p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>
254
260
<div class="joblayout">
255
261
<section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">
256
262
<div class="conbar">
@@ -301,7 +307,7 @@
301
307
</label>
302
308
<h2>{{t "pipe.related"}}</h2>
303
309
<ul class="related">
304
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}
310
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}
305
311
</ul>
306
312
{{if .CanPlay}}
307
313
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">
@@ -32,11 +32,11 @@32
<div class="stages">32
<div class="stages">33
{{range $pipe.Stages}}33
{{range $pipe.Stages}}34
<span class="stage">34
<span class="stage">35
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>35
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>36
<div class="stage-pop" popover="manual">36
<div class="stage-pop" popover="manual">37
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>37
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>38
<ul>38
<ul>39
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}39
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}40
</ul>40
</ul>41
</div>41
</div>42
</span>42
</span>@@ -185,45 +185,12 @@185
<button type="submit">{{t "action.start"}}</button>185
<button type="submit">{{t "action.start"}}</button>186
</form>186
</form>187
{{end}}187
{{end}}188
<div class="hscroll">188
<div class="hscroll"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>189
<table class="pipes">189
<table class="pipes">190
<thead><tr><th>{{t "pipe.col.status"}}</th><th>{{t "pipe.col.pipeline"}}</th><th>{{t "pipe.col.by"}}</th><th>{{t "pipe.col.stages"}}</th></tr></thead>190
<thead><tr><th>{{t "pipe.col.status"}}</th><th>{{t "pipe.col.pipeline"}}</th><th>{{t "pipe.col.by"}}</th><th>{{t "pipe.col.stages"}}</th></tr></thead>191
<tbody>191
<tbody>192
{{range .PipeRows}}192
{{template "pipe-rows" .}}193
{{$pipe := .}}193
{{if not .PipeRows}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}194
<tr>195
<td>196
<span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span>197
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> {{.Duration}}</div>198
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> {{.When}}</div>199
</td>200
<td>201
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>202
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}203
<div class="chips">204
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}205
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}206
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}207
</div>208
</td>209
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>210
<td>211
<div class="stages">212
{{range .Stages}}213
<span class="stage">214
<button type="button" class="stage-dot {{.Status}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>215
<div class="stage-pop" popover="manual">216
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>217
<ul>218
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}219
</ul>220
</div>221
</span>222
{{end}}223
</div>224
</td>225
</tr>226
{{else}}<tr><td colspan="4" class="muted">{{t "pipe.none"}}</td></tr>{{end}}227
</tbody>194
</tbody>228
</table>195
</table>229
</div>196
</div>@@ -236,21 +203,60 @@236
{{template "layout-start" .}}203
{{template "layout-start" .}}237
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>204
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>238
{{template "pipenav" .}}205
{{template "pipenav" .}}239
<p><span class="pill">{{.Pipe.Status}}</span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>206
<p><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span> {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a></p>240
<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>207
<p class="muted">{{t "pipe.runningOn" .RunnerName}}</p>241
<ul class="clean">208
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>242
{{range .Jobs}}<li><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="pill">{{.Status}}</span> <span class="muted">{{.Stage}}</span></li>{{end}}209
{{range .PipeJobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$.Pipe.ID}}/jobs/{{.ID}}">{{.Name}}</a> <span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}243
</ul>210
</ul>211
<script src="/assets/pipeline.js"></script>244
{{template "layout-end" .}}212
{{template "layout-end" .}}245
{{end}}213
{{end}}246
214
215
{{define "pipe-rows"}}216
{{range .PipeRows}}217
{{$pipe := .}}218
<tr data-pipe="{{.ID}}">219
<td>220
<span class="status {{.Status}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.Label}}</span></span>221
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="5.5" fill="none" stroke="currentColor" stroke-width="1.4"/><path d="M8 4.8V8.2L10.2 9.4" fill="none" stroke="currentColor" stroke-width="1.4" stroke-linecap="round"/></svg> <span data-pipe-duration>{{.Duration}}</span></div>222
<div class="when"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><rect x="2.5" y="3.5" width="11" height="10" rx="1.5" fill="none" stroke="currentColor" stroke-width="1.3"/><path d="M2.5 6.5h11M5.5 2.5v2M10.5 2.5v2" fill="none" stroke="currentColor" stroke-width="1.3" stroke-linecap="round"/></svg> <span data-pipe-when>{{.When}}</span></div>223
</td>224
<td>225
<a class="pipeid" href="/{{$.Repo.FullPath}}/-/pipelines/{{.ID}}">#{{.ID}}</a>226
{{if .Title}}<div><a class="ellip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}">{{.Title}}</a></div>{{end}}227
<div class="chips">228
{{if .Ref}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commits?rev={{.Ref}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true">{{if eq .RefKind "tag"}}<path d="M2.2 2.2h5.2l6.2 6.2-5.2 5.2-6.2-6.2V2.2z" fill="none" stroke="currentColor" stroke-width="1.3"/><circle cx="5.2" cy="5.2" r="1" fill="currentColor"/>{{else}}<circle cx="4" cy="3.2" r="1.5" fill="currentColor"/><circle cx="4" cy="12.8" r="1.5" fill="currentColor"/><circle cx="12" cy="6.4" r="1.5" fill="currentColor"/><path d="M4 4.7v6.6M4 6.4c2.4 0 4.2.2 6 .2 1.2 0 2 1 2 1.8" fill="none" stroke="currentColor" stroke-width="1.3"/>{{end}}</svg>{{.Ref}}</a>{{end}}229
{{if .Short}}<a class="chip" href="/{{$.Repo.FullPath}}/-/commit/{{.SHA}}"><svg class="ico" viewBox="0 0 16 16" aria-hidden="true"><circle cx="8" cy="8" r="2.1" fill="currentColor"/><path d="M8 1.8v3.4M8 10.8v3.4" stroke="currentColor" stroke-width="1.4"/></svg>{{.Short}}</a>{{end}}230
{{if .Actor}}{{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else}}<span class="avatar sm">{{.Initial}}</span>{{end}}{{end}}231
</div>232
</td>233
<td>{{if .Actor}}{{if .Avatar}}<img class="avatar" src="{{.Avatar}}" alt="{{.Actor}}">{{else}}<span class="avatar">{{.Initial}}</span>{{end}}{{end}}</td>234
<td>235
<div class="stages">236
{{range .Stages}}237
<span class="stage">238
<button type="button" class="stage-dot {{.Status}}" data-stage="{{.Name}}" data-tip="{{.Tip}}" aria-label="{{.Tip}}"><span class="mark"></span></button>239
<div class="stage-pop" popover="manual">240
<strong>{{t "pipe.stage"}}: {{.Name}}</strong>241
<ul>242
{{range .Jobs}}<li data-job="{{.ID}}"><a href="/{{$.Repo.FullPath}}/-/pipelines/{{$pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}243
</ul>244
</div>245
</span>246
{{end}}247
</div>248
</td>249
</tr>250
{{end}}251
{{end}}252
247
{{define "job"}}253
{{define "job"}}248
{{template "layout-start" .}}254
{{template "layout-start" .}}249
<header class="pagehead"><h1>{{with .JobPage}}{{.Name}}{{end}}</h1></header>255
<header class="pagehead"><h1>{{with .JobPage}}{{.Name}}{{end}}</h1></header>250
{{template "pipenav" $}}256
{{template "pipenav" $}}251
{{with .JobPage}}257
{{with .JobPage}}252
{{$page := .}}258
{{$page := .}}253
<p class="jobhead"><span class="status {{.Status}}"><span class="mark"></span>{{.Label}}</span> <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>259
<p class="jobhead"><span class="status {{.Status}}" data-job-status><span class="mark"></span><span data-job-label>{{.Label}}</span></span>{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{t "pipe.started"}} {{.When}} {{t "pipe.by"}}</span> {{if .Avatar}}<img class="avatar sm" src="{{.Avatar}}" alt="">{{else if .Actor}}<span class="avatar sm">{{.Initial}}</span>{{end}} <strong>{{.Actor}}</strong></p>254
<div class="joblayout">260
<div class="joblayout">255
<section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">261
<section class="console-wrap" data-console data-log-url="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/log" data-offset="{{.LogBytes}}" data-running="{{if .Running}}1{{end}}">256
<div class="conbar">262
<div class="conbar">@@ -301,7 +307,7 @@301
</label>307
</label>302
<h2>{{t "pipe.related"}}</h2>308
<h2>{{t "pipe.related"}}</h2>303
<ul class="related">309
<ul class="related">304
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}</a></li>{{end}}310
{{range .Related}}<li data-stage="{{.Stage}}"{{if ne .Stage $page.Stage}} hidden{{end}}>{{if .Current}}<span class="arrow">→</span>{{else}}<span class="arrow"></span>{{end}}<a href="/{{$.Repo.FullPath}}/-/pipelines/{{$page.Pipe.ID}}/jobs/{{.ID}}"><span class="stage-dot sm {{.Status}}"><span class="mark"></span></span>{{.Name}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}}</a></li>{{end}}305
</ul>311
</ul>306
{{if .CanPlay}}312
{{if .CanPlay}}307
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">313
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">