Merge branch 'stage' into 'master'
@@ -14,6 +14,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).
14
14
- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.
15
15
- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.
16
16
- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.
17
- Jobs die je niet halverwege wilt stoppen (FTP-upload, databasemigratie) markeer je met `doNotInterrupt: true`: BlueGit stopt ze nooit automatisch, een nieuwere pipeline op dezelfde ref wacht erop, en handmatig stoppen vraagt om bevestiging. Zie [docs/CI.md](docs/CI.md#donotinterrupt).
17
18
- Webhooks op een repository of een groep, met presets, een eigen body en een overzicht van de laatste afleveringen.
18
19
- Geheimen als omgevingsvariabelen in een job. Een beschermd geheim gaat alleen mee op een beschermde branch.
19
20
- Groepen, met eigen leden, geheimen en webhooks.
@@ -14,6 +14,7 @@ Het logo is de blauwe ster: [`assets/logo.svg`](assets/logo.svg).14
- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.14
- Merge requests met reviews, squash en het verwijderen van de bronbranch na een merge.15
- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.15
- Issues, met beschrijvingssjablonen in `.bluegit/issue_templates`. Merge requests gebruiken `.bluegit/merge_request_templates`. `Default.md` vult een lege beschrijving. Dezelfde namen onder `.gitlab/` zijn een terugval.16
- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.16
- Een ingebouwde CI-runner, Steve. Het bestand is `blue-ci-cd.yml`. Elke job draait in een eigen container. `image: bluegit/base` en de andere aliassen zijn image-presets die Steve lokaal bouwt.17
- Jobs die je niet halverwege wilt stoppen (FTP-upload, databasemigratie) markeer je met `doNotInterrupt: true`: BlueGit stopt ze nooit automatisch, een nieuwere pipeline op dezelfde ref wacht erop, en handmatig stoppen vraagt om bevestiging. Zie [docs/CI.md](docs/CI.md#donotinterrupt).17
- Webhooks op een repository of een groep, met presets, een eigen body en een overzicht van de laatste afleveringen.18
- Webhooks op een repository of een groep, met presets, een eigen body en een overzicht van de laatste afleveringen.18
- Geheimen als omgevingsvariabelen in een job. Een beschermd geheim gaat alleen mee op een beschermde branch.19
- Geheimen als omgevingsvariabelen in een job. Een beschermd geheim gaat alleen mee op een beschermde branch.19
- Groepen, met eigen leden, geheimen en webhooks.20
- Groepen, met eigen leden, geheimen en webhooks.@@ -440,6 +440,11 @@ func (l *logBuffer) take() string {
440
440
func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {
441
441
c.log.Info("job", "id", pl.JobID, "name", pl.Job.Name)
442
442
base := fmt.Sprintf("/api/v1/runner/jobs/%d", pl.JobID)
443
if pl.Job.DoNotInterrupt {
444
// Stoppen van de runner (SIGTERM) breekt deze job niet af; de
445
// workers wachten tot hij klaar is. Annuleren met force werkt wel.
446
parent = context.WithoutCancel(parent)
447
}
443
448
ctx, cancel := context.WithCancel(parent)
444
449
defer cancel()
445
450
runCtx := ctx
@@ -440,6 +440,11 @@ func (l *logBuffer) take() string {440
func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {440
func (c *client) runJob(parent context.Context, pl runner.RemotePayload) {441
c.log.Info("job", "id", pl.JobID, "name", pl.Job.Name)441
c.log.Info("job", "id", pl.JobID, "name", pl.Job.Name)442
base := fmt.Sprintf("/api/v1/runner/jobs/%d", pl.JobID)442
base := fmt.Sprintf("/api/v1/runner/jobs/%d", pl.JobID)443
if pl.Job.DoNotInterrupt {444
// Stoppen van de runner (SIGTERM) breekt deze job niet af; de445
// workers wachten tot hij klaar is. Annuleren met force werkt wel.446
parent = context.WithoutCancel(parent)447
}443
ctx, cancel := context.WithCancel(parent)448
ctx, cancel := context.WithCancel(parent)444
defer cancel()449
defer cancel()445
runCtx := ctx450
runCtx := ctx@@ -158,6 +158,10 @@ func serve(args []string) error {
158
158
httpSrv := &http.Server{Addr: cfg.Listen, Handler: srv.Handler(), ReadHeaderTimeout: 10 * time.Second}
159
159
go func() {
160
160
<-ctx.Done()
161
if rn != nil {
162
// doNotInterrupt-jobs lopen uit; de website blijft zo lang bereikbaar.
163
rn.WaitProtected(func(n int64) { log.Info("wacht op doNotInterrupt-jobs voor afsluiten", "count", n) })
164
}
161
165
shut, cancel := context.WithTimeout(context.Background(), 10*time.Second)
162
166
defer cancel()
163
167
_ = httpSrv.Shutdown(shut)
@@ -158,6 +158,10 @@ func serve(args []string) error {158
httpSrv := &http.Server{Addr: cfg.Listen, Handler: srv.Handler(), ReadHeaderTimeout: 10 * time.Second}158
httpSrv := &http.Server{Addr: cfg.Listen, Handler: srv.Handler(), ReadHeaderTimeout: 10 * time.Second}159
go func() {159
go func() {160
<-ctx.Done()160
<-ctx.Done()161
if rn != nil {162
// doNotInterrupt-jobs lopen uit; de website blijft zo lang bereikbaar.163
rn.WaitProtected(func(n int64) { log.Info("wacht op doNotInterrupt-jobs voor afsluiten", "count", n) })164
}161
shut, cancel := context.WithTimeout(context.Background(), 10*time.Second)165
shut, cancel := context.WithTimeout(context.Background(), 10*time.Second)162
defer cancel()166
defer cancel()163
_ = httpSrv.Shutdown(shut)167
_ = httpSrv.Shutdown(shut)@@ -53,6 +53,7 @@ jobs:
53
53
| `services` | Sidecar-containers op een eigen Docker-netwerk met de job. Een tekst, of `name`, `alias`, `command`, `entrypoint` en `variables`. Zonder alias is dat het imagenaam zonder registry en tag. |
54
54
| `environment` | Een naam, of `{name, url}`. Zet `CI_ENVIRONMENT_NAME` en `CI_ENVIRONMENT_URL`. Geen deployment en geen `on_stop`. |
55
55
| `interruptible` | Standaard uit. Een nieuwe pipeline op dezelfde ref annuleert oudere jobs die dit aan hebben en nog in de wachtrij staan of lopen. Zo'n job heet in de UI **Obsolete** (tooltip: canceled because a newer pipeline started for the same ref). |
56
| `doNotInterrupt` | Standaard `false`. Een **lopende** job met `doNotInterrupt: true` stopt BlueGit nooit automatisch. Een nieuwere pipeline op dezelfde ref wacht (status *Wacht*, `waiting_for_job`) tot de job klaar is; handmatig annuleren vraagt om bevestiging (API/`bg`: `force=true` / `--force`). Zie hieronder. |
56
57
| `tags` | Bewaard bij de job. Tags kiezen geen runner; welke runner een job krijgt staat in [runner.md](runner.md). |
57
58
| `extends` | Eén naam of een lijst. Een job waarvan de naam met `.` begint is een sjabloon en draait niet. |
58
59
@@ -147,3 +148,41 @@ De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt
147
148
- **Timeout**: status `failed` met `failure_reason: job_execution_timeout`. Het log eindigt met `Job timed out after <duur> (limit: <bron>)`. De limiet is de `timeout:` van de job, anders `ci.timeout_seconds` van de server (standaard 30 minuten); de runnerinstelling *Maximum job duration* kapt beide af.
148
149
- Webhook-jobs hebben dezelfde `cancel_reason` en `failure_reason`. Pipeline-events gaan alleen bij geslaagd of mislukt; een geannuleerde of obsolete pipeline stuurt niets.
149
150
- Bestaande jobs zijn bij de upgrade omgezet: alleen een `interruptible` job met de melding in het log wordt obsolete. Vóór deze versie schreef de runner die melding ook bij handmatig annuleren.
151
152
153
## doNotInterrupt
154
155
Voor jobs die je niet halverwege wilt stoppen, zoals een FTP-upload of een databasemigratie:
156
157
```yaml
158
deploy:
159
stage: deploy
160
doNotInterrupt: true
161
script: ./upload.sh
162
```
163
164
- Mag ook in `default:`, via `extends:` en templates. Een waarde die geen boolean is, geeft een configuratiefout.
165
- Alleen een job die **loopt** wordt beschermd. Wachtende jobs van een oude pipeline kunnen gewoon geannuleerd of obsolete worden, zoals nu.
166
- **Nieuwere pipeline op dezelfde ref**: die start geen jobs zolang een oudere pipeline op die ref een lopende doNotInterrupt-job heeft. De UI toont *Wacht op niet-onderbreekbare job X in pipeline #N*, de API `status: waiting_for_job` plus `waiting_for`. Daarna gaat de oude pipeline af (Obsolete als de rest door de nieuwe pipeline werd geannuleerd) en start de nieuwe. Een tussenliggende pipeline wordt gewoon obsolete (als zijn jobs `interruptible` zijn). Er ontstaat geen deadlock: alleen oudere pipelines houden nieuwere tegen, en de job-timeout blijft gelden. Faalt of timet de job uit, dan gaat de nieuwe pipeline gewoon verder.
167
- **Handmatig annuleren** (job of pipeline): in de UI een waarschuwingsvenster met de naam van de job(s). Via de API `POST …/cancel?force=true`, via `bg pipeline cancel|cancel-job … --force`. Zonder force: HTTP 409 met uitleg.
168
169
### Alle paden die een lopende job kunnen stoppen
170
171
| Pad | Gedrag met doNotInterrupt |
172
| --- | --- |
173
| Nieuwe pipeline op dezelfde ref (`interruptible`) | Lopende job loopt uit; de nieuwe pipeline wacht. |
174
| Job of pipeline annuleren (UI, API, `bg`) | Waarschuwing in de UI; API/`bg` alleen met `force=true`/`--force`. |
175
| Repository verwijderen | Geweigerd zolang de job loopt (UI: wachten; API: `force=true`). |
176
| Aparte runner intrekken (account, groep, globaal; UI en API) | Geweigerd zolang die runner de job draait (API: `force=true`). |
177
| Aparte runner geeft geen hartslag meer | Job wordt niet na 5 minuten als mislukt afgerond; alleen na timeout + 5 minuten. |
178
| BlueGit stoppen of herstarten (systemd, reboot) | BlueGit wacht met afsluiten tot de job klaar is (`TimeoutStopSec=49h`); de website blijft zolang bereikbaar. |
179
| Self-update | Wachtte al op nul lopende jobs en breekt nooit iets af. |
180
| `bluegit-runner` stoppen (SIGTERM) | De runner wacht tot de job klaar is (`TimeoutStopSec=49h`). |
181
| Runner pauzeren, instellingen wijzigen | Stopte lopende jobs al niet. |
182
| Branch verwijderen, MR sluiten of mergen, zichtbaarheid wijzigen | BlueGit annuleert hierbij geen jobs. |
183
184
**Uitzonderingen** (bewust):
185
1. **Job-timeout**: blijft gelden, anders kan een vastgelopen job alles eeuwig blokkeren. Een timeout is geen annulering maar `failed` met `job_execution_timeout`.
186
2. **Crash, `kill -9`, stroomuitval** van BlueGit of de runnerhost: het proces is weg, dus de job ook. Na de herstart staat de job op `failed` met de melding dat BlueGit herstartte.
187
3. **Expliciet forceren** door een gebruiker (`force=true`, of *Toch stoppen* in het venster).
188
4. **Aparte runner die langer dan timeout + 5 minuten onbereikbaar is**: dan wordt de job als `runner_system_failure` afgerond, omdat BlueGit niet kan weten of hij nog loopt.
@@ -53,6 +53,7 @@ jobs:53
| `services` | Sidecar-containers op een eigen Docker-netwerk met de job. Een tekst, of `name`, `alias`, `command`, `entrypoint` en `variables`. Zonder alias is dat het imagenaam zonder registry en tag. |53
| `services` | Sidecar-containers op een eigen Docker-netwerk met de job. Een tekst, of `name`, `alias`, `command`, `entrypoint` en `variables`. Zonder alias is dat het imagenaam zonder registry en tag. |54
| `environment` | Een naam, of `{name, url}`. Zet `CI_ENVIRONMENT_NAME` en `CI_ENVIRONMENT_URL`. Geen deployment en geen `on_stop`. |54
| `environment` | Een naam, of `{name, url}`. Zet `CI_ENVIRONMENT_NAME` en `CI_ENVIRONMENT_URL`. Geen deployment en geen `on_stop`. |55
| `interruptible` | Standaard uit. Een nieuwe pipeline op dezelfde ref annuleert oudere jobs die dit aan hebben en nog in de wachtrij staan of lopen. Zo'n job heet in de UI **Obsolete** (tooltip: canceled because a newer pipeline started for the same ref). |55
| `interruptible` | Standaard uit. Een nieuwe pipeline op dezelfde ref annuleert oudere jobs die dit aan hebben en nog in de wachtrij staan of lopen. Zo'n job heet in de UI **Obsolete** (tooltip: canceled because a newer pipeline started for the same ref). |56
| `doNotInterrupt` | Standaard `false`. Een **lopende** job met `doNotInterrupt: true` stopt BlueGit nooit automatisch. Een nieuwere pipeline op dezelfde ref wacht (status *Wacht*, `waiting_for_job`) tot de job klaar is; handmatig annuleren vraagt om bevestiging (API/`bg`: `force=true` / `--force`). Zie hieronder. |56
| `tags` | Bewaard bij de job. Tags kiezen geen runner; welke runner een job krijgt staat in [runner.md](runner.md). |57
| `tags` | Bewaard bij de job. Tags kiezen geen runner; welke runner een job krijgt staat in [runner.md](runner.md). |57
| `extends` | Eén naam of een lijst. Een job waarvan de naam met `.` begint is een sjabloon en draait niet. |58
| `extends` | Eén naam of een lijst. Een job waarvan de naam met `.` begint is een sjabloon en draait niet. |58
59
@@ -147,3 +148,41 @@ De jobpagina vraagt nieuwe regels op zolang de job in de wachtrij staat of loopt147
- **Timeout**: status `failed` met `failure_reason: job_execution_timeout`. Het log eindigt met `Job timed out after <duur> (limit: <bron>)`. De limiet is de `timeout:` van de job, anders `ci.timeout_seconds` van de server (standaard 30 minuten); de runnerinstelling *Maximum job duration* kapt beide af.148
- **Timeout**: status `failed` met `failure_reason: job_execution_timeout`. Het log eindigt met `Job timed out after <duur> (limit: <bron>)`. De limiet is de `timeout:` van de job, anders `ci.timeout_seconds` van de server (standaard 30 minuten); de runnerinstelling *Maximum job duration* kapt beide af.148
- Webhook-jobs hebben dezelfde `cancel_reason` en `failure_reason`. Pipeline-events gaan alleen bij geslaagd of mislukt; een geannuleerde of obsolete pipeline stuurt niets.149
- Webhook-jobs hebben dezelfde `cancel_reason` en `failure_reason`. Pipeline-events gaan alleen bij geslaagd of mislukt; een geannuleerde of obsolete pipeline stuurt niets.149
- Bestaande jobs zijn bij de upgrade omgezet: alleen een `interruptible` job met de melding in het log wordt obsolete. Vóór deze versie schreef de runner die melding ook bij handmatig annuleren.150
- Bestaande jobs zijn bij de upgrade omgezet: alleen een `interruptible` job met de melding in het log wordt obsolete. Vóór deze versie schreef de runner die melding ook bij handmatig annuleren.151
152
153
## doNotInterrupt154
155
Voor jobs die je niet halverwege wilt stoppen, zoals een FTP-upload of een databasemigratie:156
157
```yaml158
deploy:159
stage: deploy160
doNotInterrupt: true161
script: ./upload.sh162
```163
164
- Mag ook in `default:`, via `extends:` en templates. Een waarde die geen boolean is, geeft een configuratiefout.165
- Alleen een job die **loopt** wordt beschermd. Wachtende jobs van een oude pipeline kunnen gewoon geannuleerd of obsolete worden, zoals nu.166
- **Nieuwere pipeline op dezelfde ref**: die start geen jobs zolang een oudere pipeline op die ref een lopende doNotInterrupt-job heeft. De UI toont *Wacht op niet-onderbreekbare job X in pipeline #N*, de API `status: waiting_for_job` plus `waiting_for`. Daarna gaat de oude pipeline af (Obsolete als de rest door de nieuwe pipeline werd geannuleerd) en start de nieuwe. Een tussenliggende pipeline wordt gewoon obsolete (als zijn jobs `interruptible` zijn). Er ontstaat geen deadlock: alleen oudere pipelines houden nieuwere tegen, en de job-timeout blijft gelden. Faalt of timet de job uit, dan gaat de nieuwe pipeline gewoon verder.167
- **Handmatig annuleren** (job of pipeline): in de UI een waarschuwingsvenster met de naam van de job(s). Via de API `POST …/cancel?force=true`, via `bg pipeline cancel|cancel-job … --force`. Zonder force: HTTP 409 met uitleg.168
169
### Alle paden die een lopende job kunnen stoppen170
171
| Pad | Gedrag met doNotInterrupt |172
| --- | --- |173
| Nieuwe pipeline op dezelfde ref (`interruptible`) | Lopende job loopt uit; de nieuwe pipeline wacht. |174
| Job of pipeline annuleren (UI, API, `bg`) | Waarschuwing in de UI; API/`bg` alleen met `force=true`/`--force`. |175
| Repository verwijderen | Geweigerd zolang de job loopt (UI: wachten; API: `force=true`). |176
| Aparte runner intrekken (account, groep, globaal; UI en API) | Geweigerd zolang die runner de job draait (API: `force=true`). |177
| Aparte runner geeft geen hartslag meer | Job wordt niet na 5 minuten als mislukt afgerond; alleen na timeout + 5 minuten. |178
| BlueGit stoppen of herstarten (systemd, reboot) | BlueGit wacht met afsluiten tot de job klaar is (`TimeoutStopSec=49h`); de website blijft zolang bereikbaar. |179
| Self-update | Wachtte al op nul lopende jobs en breekt nooit iets af. |180
| `bluegit-runner` stoppen (SIGTERM) | De runner wacht tot de job klaar is (`TimeoutStopSec=49h`). |181
| Runner pauzeren, instellingen wijzigen | Stopte lopende jobs al niet. |182
| Branch verwijderen, MR sluiten of mergen, zichtbaarheid wijzigen | BlueGit annuleert hierbij geen jobs. |183
184
**Uitzonderingen** (bewust):185
1. **Job-timeout**: blijft gelden, anders kan een vastgelopen job alles eeuwig blokkeren. Een timeout is geen annulering maar `failed` met `job_execution_timeout`.186
2. **Crash, `kill -9`, stroomuitval** van BlueGit of de runnerhost: het proces is weg, dus de job ook. Na de herstart staat de job op `failed` met de melding dat BlueGit herstartte.187
3. **Expliciet forceren** door een gebruiker (`force=true`, of *Toch stoppen* in het venster).188
4. **Aparte runner die langer dan timeout + 5 minuten onbereikbaar is**: dan wordt de job als `runner_system_failure` afgerond, omdat BlueGit niet kan weten of hij nog loopt.@@ -0,0 +1,34 @@
1
package ci
2
3
import "testing"
4
5
func TestDoNotInterruptParse(t *testing.T) {
6
p, err := Parse([]byte(`
7
.safe:
8
doNotInterrupt: true
9
deploy:
10
extends: .safe
11
image: alpine
12
script: ["true"]
13
plain:
14
image: alpine
15
script: ["true"]
16
`))
17
if err != nil {
18
t.Fatal(err)
19
}
20
jobs, err := p.Select(Eval{Env: map[string]string{"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "push"}})
21
if err != nil {
22
t.Fatal(err)
23
}
24
got := map[string]bool{}
25
for _, j := range jobs {
26
got[j.Name] = j.DoNotInterrupt
27
}
28
if !got["deploy"] || got["plain"] {
29
t.Fatalf("%v", got)
30
}
31
if _, err := Parse([]byte("x:\n image: alpine\n script: [\"true\"]\n doNotInterrupt: misschien\n")); err == nil {
32
t.Fatal("geen boolean hoort een fout te geven")
33
}
34
}
@@ -0,0 +1,34 @@1
package ci2
3
import "testing"4
5
func TestDoNotInterruptParse(t *testing.T) {6
p, err := Parse([]byte(`7
.safe:8
doNotInterrupt: true9
deploy:10
extends: .safe11
image: alpine12
script: ["true"]13
plain:14
image: alpine15
script: ["true"]16
`))17
if err != nil {18
t.Fatal(err)19
}20
jobs, err := p.Select(Eval{Env: map[string]string{"CI_COMMIT_BRANCH": "master", "CI_PIPELINE_SOURCE": "push"}})21
if err != nil {22
t.Fatal(err)23
}24
got := map[string]bool{}25
for _, j := range jobs {26
got[j.Name] = j.DoNotInterrupt27
}28
if !got["deploy"] || got["plain"] {29
t.Fatalf("%v", got)30
}31
if _, err := Parse([]byte("x:\n image: alpine\n script: [\"true\"]\n doNotInterrupt: misschien\n")); err == nil {32
t.Fatal("geen boolean hoort een fout te geven")33
}34
}@@ -45,6 +45,8 @@ type Job struct {
45
45
Services []Service
46
46
Environment Environment
47
47
Interruptible bool
48
// DoNotInterrupt: nooit automatisch halverwege stoppen (doNotInterrupt).
49
DoNotInterrupt bool
48
50
}
49
51
50
52
// Retry is het aantal extra pogingen na een mislukking. Max is hoogstens 2.
@@ -45,6 +45,8 @@ type Job struct {45
Services []Service45
Services []Service46
Environment Environment46
Environment Environment47
Interruptible bool47
Interruptible bool48
// DoNotInterrupt: nooit automatisch halverwege stoppen (doNotInterrupt).49
DoNotInterrupt bool48
}50
}49
51
50
// Retry is het aantal extra pogingen na een mislukking. Max is hoogstens 2.52
// Retry is het aantal extra pogingen na een mislukking. Max is hoogstens 2.@@ -366,6 +366,11 @@ func parseDefault(node *yaml.Node) (draft, []Issue) {
366
366
issues = append(issues, iss...)
367
367
d.job.Interruptible = b
368
368
d.present["interruptible"] = true
369
case "doNotInterrupt":
370
b, iss := parseBool(val)
371
issues = append(issues, iss...)
372
d.job.DoNotInterrupt = b
373
d.present["doNotInterrupt"] = true
369
374
case "cache":
370
375
c, iss := parseCache(val)
371
376
issues = append(issues, iss...)
@@ -412,6 +417,7 @@ func overlayJob(base Job, d draft) Job {
412
417
set("services", func() { base.Services = d.job.Services })
413
418
set("environment", func() { base.Environment = d.job.Environment })
414
419
set("interruptible", func() { base.Interruptible = d.job.Interruptible })
420
set("doNotInterrupt", func() { base.DoNotInterrupt = d.job.DoNotInterrupt })
415
421
if d.present["variables"] {
416
422
mergedVars := map[string]string{}
417
423
for k, v := range base.Variables {
@@ -451,6 +457,8 @@ func overlayDefault(base, extra draft) draft {
451
457
base.job.Retry = extra.job.Retry
452
458
case "interruptible":
453
459
base.job.Interruptible = extra.job.Interruptible
460
case "doNotInterrupt":
461
base.job.DoNotInterrupt = extra.job.DoNotInterrupt
454
462
}
455
463
}
456
464
return base
@@ -582,6 +590,10 @@ func parseJob(name string, node *yaml.Node) (draft, []Issue) {
582
590
b, iss := parseBool(val)
583
591
issues = append(issues, iss...)
584
592
d.job.Interruptible = b
593
case "doNotInterrupt":
594
b, iss := parseBool(val)
595
issues = append(issues, iss...)
596
d.job.DoNotInterrupt = b
585
597
default:
586
598
if _, ok := reserved[key]; ok {
587
599
issues = append(issues, Issue{Line: node.Content[i].Line, Key: "ci.warn.ignored", Args: []any{key}, Warning: true})
@@ -676,6 +688,7 @@ func inherit(child, parent *draft) {
676
688
copyField("services", func() { child.job.Services = parent.job.Services })
677
689
copyField("environment", func() { child.job.Environment = parent.job.Environment })
678
690
copyField("interruptible", func() { child.job.Interruptible = parent.job.Interruptible })
691
copyField("doNotInterrupt", func() { child.job.DoNotInterrupt = parent.job.DoNotInterrupt })
679
692
if len(parent.job.Variables) > 0 {
680
693
merged := map[string]string{}
681
694
for k, v := range parent.job.Variables {
@@ -366,6 +366,11 @@ func parseDefault(node *yaml.Node) (draft, []Issue) {366
issues = append(issues, iss...)366
issues = append(issues, iss...)367
d.job.Interruptible = b367
d.job.Interruptible = b368
d.present["interruptible"] = true368
d.present["interruptible"] = true369
case "doNotInterrupt":370
b, iss := parseBool(val)371
issues = append(issues, iss...)372
d.job.DoNotInterrupt = b373
d.present["doNotInterrupt"] = true369
case "cache":374
case "cache":370
c, iss := parseCache(val)375
c, iss := parseCache(val)371
issues = append(issues, iss...)376
issues = append(issues, iss...)@@ -412,6 +417,7 @@ func overlayJob(base Job, d draft) Job {412
set("services", func() { base.Services = d.job.Services })417
set("services", func() { base.Services = d.job.Services })413
set("environment", func() { base.Environment = d.job.Environment })418
set("environment", func() { base.Environment = d.job.Environment })414
set("interruptible", func() { base.Interruptible = d.job.Interruptible })419
set("interruptible", func() { base.Interruptible = d.job.Interruptible })420
set("doNotInterrupt", func() { base.DoNotInterrupt = d.job.DoNotInterrupt })415
if d.present["variables"] {421
if d.present["variables"] {416
mergedVars := map[string]string{}422
mergedVars := map[string]string{}417
for k, v := range base.Variables {423
for k, v := range base.Variables {@@ -451,6 +457,8 @@ func overlayDefault(base, extra draft) draft {451
base.job.Retry = extra.job.Retry457
base.job.Retry = extra.job.Retry452
case "interruptible":458
case "interruptible":453
base.job.Interruptible = extra.job.Interruptible459
base.job.Interruptible = extra.job.Interruptible460
case "doNotInterrupt":461
base.job.DoNotInterrupt = extra.job.DoNotInterrupt454
}462
}455
}463
}456
return base464
return base@@ -582,6 +590,10 @@ func parseJob(name string, node *yaml.Node) (draft, []Issue) {582
b, iss := parseBool(val)590
b, iss := parseBool(val)583
issues = append(issues, iss...)591
issues = append(issues, iss...)584
d.job.Interruptible = b592
d.job.Interruptible = b593
case "doNotInterrupt":594
b, iss := parseBool(val)595
issues = append(issues, iss...)596
d.job.DoNotInterrupt = b585
default:597
default:586
if _, ok := reserved[key]; ok {598
if _, ok := reserved[key]; ok {587
issues = append(issues, Issue{Line: node.Content[i].Line, Key: "ci.warn.ignored", Args: []any{key}, Warning: true})599
issues = append(issues, Issue{Line: node.Content[i].Line, Key: "ci.warn.ignored", Args: []any{key}, Warning: true})@@ -676,6 +688,7 @@ func inherit(child, parent *draft) {676
copyField("services", func() { child.job.Services = parent.job.Services })688
copyField("services", func() { child.job.Services = parent.job.Services })677
copyField("environment", func() { child.job.Environment = parent.job.Environment })689
copyField("environment", func() { child.job.Environment = parent.job.Environment })678
copyField("interruptible", func() { child.job.Interruptible = parent.job.Interruptible })690
copyField("interruptible", func() { child.job.Interruptible = parent.job.Interruptible })691
copyField("doNotInterrupt", func() { child.job.DoNotInterrupt = parent.job.DoNotInterrupt })679
if len(parent.job.Variables) > 0 {692
if len(parent.job.Variables) > 0 {680
merged := map[string]string{}693
merged := map[string]string{}681
for k, v := range parent.job.Variables {694
for k, v := range parent.job.Variables {@@ -124,6 +124,7 @@ func Build(lang i18n.Lang, presets []images.Preset) Doc {
124
124
kw("services", "info.kw.services"),
125
125
kw("environment", "info.kw.environment"),
126
126
kw("interruptible", "info.kw.interruptible"),
127
kw("doNotInterrupt", "info.kw.doNotInterrupt"),
127
128
kw("tags", "info.kw.tags"),
128
129
kw("extends", "info.kw.extends"),
129
130
},
@@ -124,6 +124,7 @@ func Build(lang i18n.Lang, presets []images.Preset) Doc {124
kw("services", "info.kw.services"),124
kw("services", "info.kw.services"),125
kw("environment", "info.kw.environment"),125
kw("environment", "info.kw.environment"),126
kw("interruptible", "info.kw.interruptible"),126
kw("interruptible", "info.kw.interruptible"),127
kw("doNotInterrupt", "info.kw.doNotInterrupt"),127
kw("tags", "info.kw.tags"),128
kw("tags", "info.kw.tags"),128
kw("extends", "info.kw.extends"),129
kw("extends", "info.kw.extends"),129
},130
},@@ -0,0 +1,81 @@
1
package i18n
2
3
// Teksten voor doNotInterrupt (niet automatisch halverwege stoppen).
4
func init() {
5
addCatalog(en, map[string]string{
6
"pipe.waiting_for_job": "Waiting",
7
"pipe.waiting_for_job.tip": "waiting for a non-interruptible job in an older pipeline on the same ref",
8
"pipe.waitingFor": "Waiting for non-interruptible job %s in pipeline #%d. This pipeline starts its jobs once that job has finished.",
9
"pipe.dni": "do not interrupt",
10
"pipe.dni.tip": "doNotInterrupt: BlueGit never stops this job automatically while it runs. A newer pipeline on the same ref waits for it.",
11
"pipe.cancel": "Cancel",
12
"pipe.cancelJob": "Cancel job",
13
"pipe.cancelPipeline": "Cancel pipeline",
14
"pipe.cancelAsk": "Cancel this job?",
15
"pipe.cancelPipeAsk": "Cancel this pipeline?",
16
"pipe.cancelDNI": "Warning: %s is marked doNotInterrupt and is running. Stopping it halfway can leave things broken, for example a half-finished FTP upload or a partly applied database change. Stop it anyway?",
17
"pipe.cancelDNIOk": "Stop anyway",
18
"flash.canceled": "Canceled.",
19
"err.doNotInterrupt": "%s is marked doNotInterrupt and is running; stopping it halfway can cause problems (for example a half-finished upload or database change). Repeat with force=true to stop it anyway.",
20
"err.dniRepoDelete": "%s is marked doNotInterrupt and is still running in this repository. Wait until it has finished, or repeat with force=true.",
21
"err.dniRunnerRevoke": "This runner is running %s, which is marked doNotInterrupt. Wait until it has finished, or repeat with force=true.",
22
})
23
addCatalog(nl, map[string]string{
24
"pipe.waiting_for_job": "Wacht",
25
"pipe.waiting_for_job.tip": "wacht op een niet-onderbreekbare job in een oudere pipeline op dezelfde ref",
26
"pipe.waitingFor": "Wacht op niet-onderbreekbare job %s in pipeline #%d. Deze pipeline start zijn jobs zodra die job klaar is.",
27
"pipe.dni": "niet onderbreken",
28
"pipe.dni.tip": "doNotInterrupt: BlueGit stopt deze job nooit automatisch terwijl hij loopt. Een nieuwere pipeline op dezelfde ref wacht erop.",
29
"pipe.cancel": "Annuleren",
30
"pipe.cancelJob": "Job annuleren",
31
"pipe.cancelPipeline": "Pipeline annuleren",
32
"pipe.cancelAsk": "Deze job annuleren?",
33
"pipe.cancelPipeAsk": "Deze pipeline annuleren?",
34
"pipe.cancelDNI": "Let op: %s is gemarkeerd als doNotInterrupt en loopt nu. Halverwege stoppen kan dingen kapot achterlaten, bijvoorbeeld een half afgemaakte FTP-upload of een deels doorgevoerde databasewijziging. Toch stoppen?",
35
"pipe.cancelDNIOk": "Toch stoppen",
36
"flash.canceled": "Geannuleerd.",
37
"err.doNotInterrupt": "%s is gemarkeerd als doNotInterrupt en loopt; halverwege stoppen kan problemen geven (bijv. een half afgemaakte upload of databasewijziging). Herhaal met force=true om toch te stoppen.",
38
"err.dniRepoDelete": "%s is gemarkeerd als doNotInterrupt en loopt nog in deze repository. Wacht tot hij klaar is, of herhaal met force=true.",
39
"err.dniRunnerRevoke": "Deze runner draait %s, gemarkeerd als doNotInterrupt. Wacht tot die klaar is, of herhaal met force=true.",
40
})
41
addCatalog(de, map[string]string{
42
"pipe.waiting_for_job": "Wartet",
43
"pipe.waiting_for_job.tip": "wartet auf einen nicht unterbrechbaren Job in einer älteren Pipeline derselben Ref",
44
"pipe.waitingFor": "Wartet auf den nicht unterbrechbaren Job %s in Pipeline #%d. Diese Pipeline startet, sobald er fertig ist.",
45
"pipe.dni": "nicht unterbrechen",
46
"pipe.dni.tip": "doNotInterrupt: BlueGit stoppt diesen Job nie automatisch, während er läuft. Eine neuere Pipeline derselben Ref wartet darauf.",
47
"pipe.cancel": "Abbrechen",
48
"pipe.cancelJob": "Job abbrechen",
49
"pipe.cancelPipeline": "Pipeline abbrechen",
50
"pipe.cancelAsk": "Diesen Job abbrechen?",
51
"pipe.cancelPipeAsk": "Diese Pipeline abbrechen?",
52
"pipe.cancelDNI": "Achtung: %s ist als doNotInterrupt markiert und läuft. Ein Abbruch mittendrin kann Schaden hinterlassen, z. B. einen halben FTP-Upload oder eine teilweise Datenbankänderung. Trotzdem stoppen?",
53
"pipe.cancelDNIOk": "Trotzdem stoppen",
54
"flash.canceled": "Abgebrochen.",
55
"err.doNotInterrupt": "%s ist als doNotInterrupt markiert und läuft; ein Abbruch mittendrin kann Probleme verursachen. Mit force=true wiederholen, um trotzdem zu stoppen.",
56
"err.dniRepoDelete": "%s ist als doNotInterrupt markiert und läuft noch in diesem Repository. Warten oder mit force=true wiederholen.",
57
"err.dniRunnerRevoke": "Dieser Runner führt %s aus (doNotInterrupt). Warten oder mit force=true wiederholen.",
58
})
59
addCatalog(fr, map[string]string{
60
"pipe.waiting_for_job": "En attente",
61
"pipe.waiting_for_job.tip": "en attente d'un job non interruptible dans un pipeline plus ancien sur la même ref",
62
"pipe.waitingFor": "En attente du job non interruptible %s dans le pipeline #%d. Ce pipeline démarre quand ce job est terminé.",
63
"pipe.dni": "ne pas interrompre",
64
"pipe.dni.tip": "doNotInterrupt : BlueGit n'arrête jamais ce job automatiquement pendant qu'il tourne. Un pipeline plus récent sur la même ref l'attend.",
65
"pipe.cancel": "Annuler",
66
"pipe.cancelJob": "Annuler le job",
67
"pipe.cancelPipeline": "Annuler le pipeline",
68
"pipe.cancelAsk": "Annuler ce job ?",
69
"pipe.cancelPipeAsk": "Annuler ce pipeline ?",
70
"pipe.cancelDNI": "Attention : %s est marqué doNotInterrupt et tourne. L'arrêter en cours peut laisser des dégâts, par exemple un envoi FTP à moitié fait ou une modification de base de données partielle. L'arrêter quand même ?",
71
"pipe.cancelDNIOk": "Arrêter quand même",
72
"flash.canceled": "Annulé.",
73
"err.doNotInterrupt": "%s est marqué doNotInterrupt et tourne ; l'arrêter en cours peut poser problème. Répétez avec force=true pour l'arrêter quand même.",
74
"err.dniRepoDelete": "%s est marqué doNotInterrupt et tourne encore dans ce dépôt. Attendez sa fin ou répétez avec force=true.",
75
"err.dniRunnerRevoke": "Ce runner exécute %s (doNotInterrupt). Attendez sa fin ou répétez avec force=true.",
76
})
77
addCatalog(en, map[string]string{"info.kw.doNotInterrupt": "true or false (default false). A running job with doNotInterrupt is never stopped automatically: a newer pipeline on the same ref waits until it has finished, and manual cancel asks for confirmation (API: force=true)."})
78
addCatalog(nl, map[string]string{"info.kw.doNotInterrupt": "true of false (standaard false). Een lopende job met doNotInterrupt wordt nooit automatisch gestopt: een nieuwere pipeline op dezelfde ref wacht tot hij klaar is, en handmatig annuleren vraagt om bevestiging (API: force=true)."})
79
addCatalog(de, map[string]string{"info.kw.doNotInterrupt": "true oder false (Standard false). Ein laufender Job mit doNotInterrupt wird nie automatisch gestoppt: eine neuere Pipeline derselben Ref wartet, und manuelles Abbrechen verlangt eine Bestätigung (API: force=true)."})
80
addCatalog(fr, map[string]string{"info.kw.doNotInterrupt": "true ou false (false par défaut). Un job doNotInterrupt en cours n'est jamais arrêté automatiquement : un pipeline plus récent sur la même ref attend, et l'annulation manuelle demande une confirmation (API : force=true)."})
81
}
@@ -0,0 +1,81 @@1
package i18n2
3
// Teksten voor doNotInterrupt (niet automatisch halverwege stoppen).4
func init() {5
addCatalog(en, map[string]string{6
"pipe.waiting_for_job": "Waiting",7
"pipe.waiting_for_job.tip": "waiting for a non-interruptible job in an older pipeline on the same ref",8
"pipe.waitingFor": "Waiting for non-interruptible job %s in pipeline #%d. This pipeline starts its jobs once that job has finished.",9
"pipe.dni": "do not interrupt",10
"pipe.dni.tip": "doNotInterrupt: BlueGit never stops this job automatically while it runs. A newer pipeline on the same ref waits for it.",11
"pipe.cancel": "Cancel",12
"pipe.cancelJob": "Cancel job",13
"pipe.cancelPipeline": "Cancel pipeline",14
"pipe.cancelAsk": "Cancel this job?",15
"pipe.cancelPipeAsk": "Cancel this pipeline?",16
"pipe.cancelDNI": "Warning: %s is marked doNotInterrupt and is running. Stopping it halfway can leave things broken, for example a half-finished FTP upload or a partly applied database change. Stop it anyway?",17
"pipe.cancelDNIOk": "Stop anyway",18
"flash.canceled": "Canceled.",19
"err.doNotInterrupt": "%s is marked doNotInterrupt and is running; stopping it halfway can cause problems (for example a half-finished upload or database change). Repeat with force=true to stop it anyway.",20
"err.dniRepoDelete": "%s is marked doNotInterrupt and is still running in this repository. Wait until it has finished, or repeat with force=true.",21
"err.dniRunnerRevoke": "This runner is running %s, which is marked doNotInterrupt. Wait until it has finished, or repeat with force=true.",22
})23
addCatalog(nl, map[string]string{24
"pipe.waiting_for_job": "Wacht",25
"pipe.waiting_for_job.tip": "wacht op een niet-onderbreekbare job in een oudere pipeline op dezelfde ref",26
"pipe.waitingFor": "Wacht op niet-onderbreekbare job %s in pipeline #%d. Deze pipeline start zijn jobs zodra die job klaar is.",27
"pipe.dni": "niet onderbreken",28
"pipe.dni.tip": "doNotInterrupt: BlueGit stopt deze job nooit automatisch terwijl hij loopt. Een nieuwere pipeline op dezelfde ref wacht erop.",29
"pipe.cancel": "Annuleren",30
"pipe.cancelJob": "Job annuleren",31
"pipe.cancelPipeline": "Pipeline annuleren",32
"pipe.cancelAsk": "Deze job annuleren?",33
"pipe.cancelPipeAsk": "Deze pipeline annuleren?",34
"pipe.cancelDNI": "Let op: %s is gemarkeerd als doNotInterrupt en loopt nu. Halverwege stoppen kan dingen kapot achterlaten, bijvoorbeeld een half afgemaakte FTP-upload of een deels doorgevoerde databasewijziging. Toch stoppen?",35
"pipe.cancelDNIOk": "Toch stoppen",36
"flash.canceled": "Geannuleerd.",37
"err.doNotInterrupt": "%s is gemarkeerd als doNotInterrupt en loopt; halverwege stoppen kan problemen geven (bijv. een half afgemaakte upload of databasewijziging). Herhaal met force=true om toch te stoppen.",38
"err.dniRepoDelete": "%s is gemarkeerd als doNotInterrupt en loopt nog in deze repository. Wacht tot hij klaar is, of herhaal met force=true.",39
"err.dniRunnerRevoke": "Deze runner draait %s, gemarkeerd als doNotInterrupt. Wacht tot die klaar is, of herhaal met force=true.",40
})41
addCatalog(de, map[string]string{42
"pipe.waiting_for_job": "Wartet",43
"pipe.waiting_for_job.tip": "wartet auf einen nicht unterbrechbaren Job in einer älteren Pipeline derselben Ref",44
"pipe.waitingFor": "Wartet auf den nicht unterbrechbaren Job %s in Pipeline #%d. Diese Pipeline startet, sobald er fertig ist.",45
"pipe.dni": "nicht unterbrechen",46
"pipe.dni.tip": "doNotInterrupt: BlueGit stoppt diesen Job nie automatisch, während er läuft. Eine neuere Pipeline derselben Ref wartet darauf.",47
"pipe.cancel": "Abbrechen",48
"pipe.cancelJob": "Job abbrechen",49
"pipe.cancelPipeline": "Pipeline abbrechen",50
"pipe.cancelAsk": "Diesen Job abbrechen?",51
"pipe.cancelPipeAsk": "Diese Pipeline abbrechen?",52
"pipe.cancelDNI": "Achtung: %s ist als doNotInterrupt markiert und läuft. Ein Abbruch mittendrin kann Schaden hinterlassen, z. B. einen halben FTP-Upload oder eine teilweise Datenbankänderung. Trotzdem stoppen?",53
"pipe.cancelDNIOk": "Trotzdem stoppen",54
"flash.canceled": "Abgebrochen.",55
"err.doNotInterrupt": "%s ist als doNotInterrupt markiert und läuft; ein Abbruch mittendrin kann Probleme verursachen. Mit force=true wiederholen, um trotzdem zu stoppen.",56
"err.dniRepoDelete": "%s ist als doNotInterrupt markiert und läuft noch in diesem Repository. Warten oder mit force=true wiederholen.",57
"err.dniRunnerRevoke": "Dieser Runner führt %s aus (doNotInterrupt). Warten oder mit force=true wiederholen.",58
})59
addCatalog(fr, map[string]string{60
"pipe.waiting_for_job": "En attente",61
"pipe.waiting_for_job.tip": "en attente d'un job non interruptible dans un pipeline plus ancien sur la même ref",62
"pipe.waitingFor": "En attente du job non interruptible %s dans le pipeline #%d. Ce pipeline démarre quand ce job est terminé.",63
"pipe.dni": "ne pas interrompre",64
"pipe.dni.tip": "doNotInterrupt : BlueGit n'arrête jamais ce job automatiquement pendant qu'il tourne. Un pipeline plus récent sur la même ref l'attend.",65
"pipe.cancel": "Annuler",66
"pipe.cancelJob": "Annuler le job",67
"pipe.cancelPipeline": "Annuler le pipeline",68
"pipe.cancelAsk": "Annuler ce job ?",69
"pipe.cancelPipeAsk": "Annuler ce pipeline ?",70
"pipe.cancelDNI": "Attention : %s est marqué doNotInterrupt et tourne. L'arrêter en cours peut laisser des dégâts, par exemple un envoi FTP à moitié fait ou une modification de base de données partielle. L'arrêter quand même ?",71
"pipe.cancelDNIOk": "Arrêter quand même",72
"flash.canceled": "Annulé.",73
"err.doNotInterrupt": "%s est marqué doNotInterrupt et tourne ; l'arrêter en cours peut poser problème. Répétez avec force=true pour l'arrêter quand même.",74
"err.dniRepoDelete": "%s est marqué doNotInterrupt et tourne encore dans ce dépôt. Attendez sa fin ou répétez avec force=true.",75
"err.dniRunnerRevoke": "Ce runner exécute %s (doNotInterrupt). Attendez sa fin ou répétez avec force=true.",76
})77
addCatalog(en, map[string]string{"info.kw.doNotInterrupt": "true or false (default false). A running job with doNotInterrupt is never stopped automatically: a newer pipeline on the same ref waits until it has finished, and manual cancel asks for confirmation (API: force=true)."})78
addCatalog(nl, map[string]string{"info.kw.doNotInterrupt": "true of false (standaard false). Een lopende job met doNotInterrupt wordt nooit automatisch gestopt: een nieuwere pipeline op dezelfde ref wacht tot hij klaar is, en handmatig annuleren vraagt om bevestiging (API: force=true)."})79
addCatalog(de, map[string]string{"info.kw.doNotInterrupt": "true oder false (Standard false). Ein laufender Job mit doNotInterrupt wird nie automatisch gestoppt: eine neuere Pipeline derselben Ref wartet, und manuelles Abbrechen verlangt eine Bestätigung (API: force=true)."})80
addCatalog(fr, map[string]string{"info.kw.doNotInterrupt": "true ou false (false par défaut). Un job doNotInterrupt en cours n'est jamais arrêté automatiquement : un pipeline plus récent sur la même ref attend, et l'annulation manuelle demande une confirmation (API : force=true)."})81
}@@ -0,0 +1,69 @@
1
package runner
2
3
import (
4
"context"
5
"path/filepath"
6
"testing"
7
"time"
8
9
"gitlab.com/Timfa/bluegit/internal/store"
10
)
11
12
// Een aparte runner zonder hartslag: een gewone job wordt afgerond, een
13
// lopende doNotInterrupt-job blijft staan tot timeout + grace.
14
func TestReapRemoteRespectsDoNotInterrupt(t *testing.T) {
15
s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))
16
if err != nil {
17
t.Fatal(err)
18
}
19
t.Cleanup(func() { _ = s.Close() })
20
ctx := context.Background()
21
tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
22
repo, _ := s.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
23
tok, _ := s.CreateRunnerRegToken(ctx, "user", tim.ID, tim.ID)
24
rn, _, err := s.RegisterRunner(ctx, tok, "remote", "test")
25
if err != nil {
26
t.Fatal(err)
27
}
28
pid, _ := s.CreatePipeline(ctx, repo.ID, "a", "refs/heads/master", "push", "tim", "a", []store.NewJob{
29
{Name: "safe", Stage: "d", Script: "true", DoNotInterrupt: true},
30
{Name: "plain", Stage: "d", Script: "true"},
31
})
32
jobs, _ := s.JobsByPipeline(ctx, pid)
33
for _, j := range jobs {
34
_, _ = s.MarkJobRunning(ctx, j.ID)
35
_ = s.SetJobRunner(ctx, j.ID, rn.ID, rn.Name)
36
}
37
old := RemoteOnlineGrace
38
RemoteOnlineGrace = -time.Second // runner geldt meteen als stil
39
t.Cleanup(func() { RemoteOnlineGrace = old })
40
r := &Runner{Store: s, Timeout: time.Hour}
41
r.reapRemote(ctx)
42
jobs, _ = s.JobsByPipeline(ctx, pid)
43
for _, j := range jobs {
44
if j.Name == "safe" && j.Status != "running" {
45
t.Fatalf("dni-job afgerond: %s", j.Status)
46
}
47
if j.Name == "plain" && j.Status != "failed" {
48
t.Fatalf("gewone job: %s", j.Status)
49
}
50
}
51
}
52
53
func TestWaitProtected(t *testing.T) {
54
r := &Runner{}
55
r.protected.Add(1)
56
done := make(chan struct{})
57
go func() { r.WaitProtected(nil); close(done) }()
58
select {
59
case <-done:
60
t.Fatal("wacht niet")
61
case <-time.After(50 * time.Millisecond):
62
}
63
r.protected.Add(-1)
64
select {
65
case <-done:
66
case <-time.After(3 * time.Second):
67
t.Fatal("blijft hangen")
68
}
69
}
@@ -0,0 +1,69 @@1
package runner2
3
import (4
"context"5
"path/filepath"6
"testing"7
"time"8
9
"gitlab.com/Timfa/bluegit/internal/store"10
)11
12
// Een aparte runner zonder hartslag: een gewone job wordt afgerond, een13
// lopende doNotInterrupt-job blijft staan tot timeout + grace.14
func TestReapRemoteRespectsDoNotInterrupt(t *testing.T) {15
s, err := store.Open(filepath.Join(t.TempDir(), "b.db"), make([]byte, 32))16
if err != nil {17
t.Fatal(err)18
}19
t.Cleanup(func() { _ = s.Close() })20
ctx := context.Background()21
tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)22
repo, _ := s.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")23
tok, _ := s.CreateRunnerRegToken(ctx, "user", tim.ID, tim.ID)24
rn, _, err := s.RegisterRunner(ctx, tok, "remote", "test")25
if err != nil {26
t.Fatal(err)27
}28
pid, _ := s.CreatePipeline(ctx, repo.ID, "a", "refs/heads/master", "push", "tim", "a", []store.NewJob{29
{Name: "safe", Stage: "d", Script: "true", DoNotInterrupt: true},30
{Name: "plain", Stage: "d", Script: "true"},31
})32
jobs, _ := s.JobsByPipeline(ctx, pid)33
for _, j := range jobs {34
_, _ = s.MarkJobRunning(ctx, j.ID)35
_ = s.SetJobRunner(ctx, j.ID, rn.ID, rn.Name)36
}37
old := RemoteOnlineGrace38
RemoteOnlineGrace = -time.Second // runner geldt meteen als stil39
t.Cleanup(func() { RemoteOnlineGrace = old })40
r := &Runner{Store: s, Timeout: time.Hour}41
r.reapRemote(ctx)42
jobs, _ = s.JobsByPipeline(ctx, pid)43
for _, j := range jobs {44
if j.Name == "safe" && j.Status != "running" {45
t.Fatalf("dni-job afgerond: %s", j.Status)46
}47
if j.Name == "plain" && j.Status != "failed" {48
t.Fatalf("gewone job: %s", j.Status)49
}50
}51
}52
53
func TestWaitProtected(t *testing.T) {54
r := &Runner{}55
r.protected.Add(1)56
done := make(chan struct{})57
go func() { r.WaitProtected(nil); close(done) }()58
select {59
case <-done:60
t.Fatal("wacht niet")61
case <-time.After(50 * time.Millisecond):62
}63
r.protected.Add(-1)64
select {65
case <-done:66
case <-time.After(3 * time.Second):67
t.Fatal("blijft hangen")68
}69
}@@ -207,7 +207,9 @@ func (r *Runner) reapRemote(ctx context.Context) {
207
207
switch {
208
208
case err != nil || rn.Revoked:
209
209
msg = "runner_system_failure: runner was removed"
210
case now.Sub(rn.LastSeen) > RemoteOnlineGrace:
210
case now.Sub(rn.LastSeen) > RemoteOnlineGrace && !rj.Job.DoNotInterrupt:
211
// doNotInterrupt: de job kan op de runner gewoon doorlopen als
212
// alleen de verbinding weg is; dan geldt alleen de timeout hieronder.
211
213
msg = "runner_system_failure: runner " + rn.Name + " stopped responding"
212
214
default:
213
215
limit := r.Timeout
@@ -207,7 +207,9 @@ func (r *Runner) reapRemote(ctx context.Context) {207
switch {207
switch {208
case err != nil || rn.Revoked:208
case err != nil || rn.Revoked:209
msg = "runner_system_failure: runner was removed"209
msg = "runner_system_failure: runner was removed"210
case now.Sub(rn.LastSeen) > RemoteOnlineGrace:210
case now.Sub(rn.LastSeen) > RemoteOnlineGrace && !rj.Job.DoNotInterrupt:211
// doNotInterrupt: de job kan op de runner gewoon doorlopen als212
// alleen de verbinding weg is; dan geldt alleen de timeout hieronder.211
msg = "runner_system_failure: runner " + rn.Name + " stopped responding"213
msg = "runner_system_failure: runner " + rn.Name + " stopped responding"212
default:214
default:213
limit := r.Timeout215
limit := r.Timeout@@ -15,6 +15,7 @@ import (
15
15
"strconv"
16
16
"strings"
17
17
"sync"
18
"sync/atomic"
18
19
"time"
19
20
20
21
"gitlab.com/Timfa/bluegit/internal/access"
@@ -48,7 +49,9 @@ type Runner struct {
48
49
slots chan struct{}
49
50
mu sync.RWMutex
50
51
cancelMu sync.Mutex
51
cancel map[int64]context.CancelFunc
52
// protected telt lopende doNotInterrupt-jobs van de ingebouwde runner.
53
protected atomic.Int64
54
cancel map[int64]context.CancelFunc
52
55
}
53
56
54
57
// Interrupt stopt lopende jobs waarvan een nieuwere pipeline de beurt overneemt.
@@ -358,7 +361,15 @@ func (r *Runner) releaseSlot() {
358
361
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
359
362
defer r.releaseSlot()
360
363
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)
361
base, stop := context.WithCancel(ctx)
364
parent := ctx
365
if job.DoNotInterrupt {
366
// Een herstart of stop van BlueGit breekt deze job niet af; main
367
// wacht met afsluiten tot hij klaar is (zie WaitProtected).
368
parent = context.WithoutCancel(ctx)
369
r.protected.Add(1)
370
defer r.protected.Add(-1)
371
}
372
base, stop := context.WithCancel(parent)
362
373
r.track(job.ID, stop)
363
374
defer func() {
364
375
r.untrack(job.ID)
@@ -378,7 +389,7 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {
378
389
kind := ""
379
390
switch {
380
391
case err == nil:
381
case ctx.Err() == nil && base.Err() != nil:
392
case parent.Err() == nil && base.Err() != nil:
382
393
status = "canceled"
383
394
kind = r.cancelReason(job.RepoID, job.ID)
384
395
extra = stamp(cancelText(kind))
@@ -1311,3 +1322,19 @@ func execOut(ctx context.Context, bin string, args ...string) (string, error) {
1311
1322
func cloneArgs(bare, work string) []string {
1312
1323
return []string{"clone", "--no-hardlinks", bare, work}
1313
1324
}
1325
1326
// ProtectedRunning is het aantal lopende doNotInterrupt-jobs in dit proces.
1327
func (r *Runner) ProtectedRunning() int64 { return r.protected.Load() }
1328
1329
// WaitProtected wacht bij het afsluiten tot alle lopende
1330
// doNotInterrupt-jobs klaar zijn. Hun eigen timeout begrenst het wachten.
1331
func (r *Runner) WaitProtected(log func(n int64)) {
1332
last := int64(-1)
1333
for n := r.protected.Load(); n > 0; n = r.protected.Load() {
1334
if n != last && log != nil {
1335
log(n)
1336
last = n
1337
}
1338
time.Sleep(time.Second)
1339
}
1340
}
@@ -15,6 +15,7 @@ import (15
"strconv"15
"strconv"16
"strings"16
"strings"17
"sync"17
"sync"18
"sync/atomic"18
"time"19
"time"19
20
20
"gitlab.com/Timfa/bluegit/internal/access"21
"gitlab.com/Timfa/bluegit/internal/access"@@ -48,7 +49,9 @@ type Runner struct {48
slots chan struct{}49
slots chan struct{}49
mu sync.RWMutex50
mu sync.RWMutex50
cancelMu sync.Mutex51
cancelMu sync.Mutex51
cancel map[int64]context.CancelFunc52
// protected telt lopende doNotInterrupt-jobs van de ingebouwde runner.53
protected atomic.Int6454
cancel map[int64]context.CancelFunc52
}55
}53
56
54
// Interrupt stopt lopende jobs waarvan een nieuwere pipeline de beurt overneemt.57
// Interrupt stopt lopende jobs waarvan een nieuwere pipeline de beurt overneemt.@@ -358,7 +361,15 @@ func (r *Runner) releaseSlot() {358
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {361
func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {359
defer r.releaseSlot()362
defer r.releaseSlot()360
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)363
before, _ := r.Store.PipelineByID(context.Background(), p.RepoID, p.ID)361
base, stop := context.WithCancel(ctx)364
parent := ctx365
if job.DoNotInterrupt {366
// Een herstart of stop van BlueGit breekt deze job niet af; main367
// wacht met afsluiten tot hij klaar is (zie WaitProtected).368
parent = context.WithoutCancel(ctx)369
r.protected.Add(1)370
defer r.protected.Add(-1)371
}372
base, stop := context.WithCancel(parent)362
r.track(job.ID, stop)373
r.track(job.ID, stop)363
defer func() {374
defer func() {364
r.untrack(job.ID)375
r.untrack(job.ID)@@ -378,7 +389,7 @@ func (r *Runner) execute(ctx context.Context, p store.Pipeline, job store.Job) {378
kind := ""389
kind := ""379
switch {390
switch {380
case err == nil:391
case err == nil:381
case ctx.Err() == nil && base.Err() != nil:392
case parent.Err() == nil && base.Err() != nil:382
status = "canceled"393
status = "canceled"383
kind = r.cancelReason(job.RepoID, job.ID)394
kind = r.cancelReason(job.RepoID, job.ID)384
extra = stamp(cancelText(kind))395
extra = stamp(cancelText(kind))@@ -1311,3 +1322,19 @@ func execOut(ctx context.Context, bin string, args ...string) (string, error) {1311
func cloneArgs(bare, work string) []string {1322
func cloneArgs(bare, work string) []string {1312
return []string{"clone", "--no-hardlinks", bare, work}1323
return []string{"clone", "--no-hardlinks", bare, work}1313
}1324
}1325
1326
// ProtectedRunning is het aantal lopende doNotInterrupt-jobs in dit proces.1327
func (r *Runner) ProtectedRunning() int64 { return r.protected.Load() }1328
1329
// WaitProtected wacht bij het afsluiten tot alle lopende1330
// doNotInterrupt-jobs klaar zijn. Hun eigen timeout begrenst het wachten.1331
func (r *Runner) WaitProtected(log func(n int64)) {1332
last := int64(-1)1333
for n := r.protected.Load(); n > 0; n = r.protected.Load() {1334
if n != last && log != nil {1335
log(n)1336
last = n1337
}1338
time.Sleep(time.Second)1339
}1340
}@@ -226,8 +226,8 @@ func (s *Server) globalRunnerDelete(w http.ResponseWriter, r *http.Request) {
226
226
if !s.globalRunnerGuard(w, r) {
227
227
return
228
228
}
229
if err := s.Store.RevokeRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r)); err != nil {
230
s.redirect(w, r, globalBack, "", s.tr(r, "runner.missing"))
229
if err := s.revokeRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r), false); err != nil {
230
s.redirect(w, r, globalBack, "", s.revokeErr(r, err))
231
231
return
232
232
}
233
233
s.redirect(w, r, globalBack, s.tr(r, "runner.revoked"), "")
@@ -226,8 +226,8 @@ func (s *Server) globalRunnerDelete(w http.ResponseWriter, r *http.Request) {226
if !s.globalRunnerGuard(w, r) {226
if !s.globalRunnerGuard(w, r) {227
return227
return228
}228
}229
if err := s.Store.RevokeRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r)); err != nil {229
if err := s.revokeRunner(r.Context(), store.RunnerGlobal, 0, s.globalRunnerID(r), false); err != nil {230
s.redirect(w, r, globalBack, "", s.tr(r, "runner.missing"))230
s.redirect(w, r, globalBack, "", s.revokeErr(r, err))231
return231
return232
}232
}233
s.redirect(w, r, globalBack, s.tr(r, "runner.revoked"), "")233
s.redirect(w, r, globalBack, s.tr(r, "runner.revoked"), "")@@ -269,7 +269,7 @@ func (s *Server) apiDeleteProject(w http.ResponseWriter, r *http.Request) {
269
269
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
270
270
return
271
271
}
272
if !s.apiOK(w, r, s.opDeleteRepo(r.Context(), apiUser(r), repo, body.Confirm)) {
272
if !s.apiOK(w, r, s.opDeleteRepo(r.Context(), apiUser(r), repo, body.Confirm, forceParam(r))) {
273
273
return
274
274
}
275
275
writeJSON(w, http.StatusNoContent, nil)
@@ -269,7 +269,7 @@ func (s *Server) apiDeleteProject(w http.ResponseWriter, r *http.Request) {269
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))269
s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))270
return270
return271
}271
}272
if !s.apiOK(w, r, s.opDeleteRepo(r.Context(), apiUser(r), repo, body.Confirm)) {272
if !s.apiOK(w, r, s.opDeleteRepo(r.Context(), apiUser(r), repo, body.Confirm, forceParam(r))) {273
return273
return274
}274
}275
writeJSON(w, http.StatusNoContent, nil)275
writeJSON(w, http.StatusNoContent, nil)@@ -353,6 +353,10 @@ func (s *Server) pipeJSONJobs(ctx context.Context, repo store.Repo, p store.Pipe
353
353
st := s.pipeStatusFor(p)
354
354
out["display_status"] = st
355
355
out["cancel_reason"] = nil
356
out["waiting_for"] = nil
357
if blk, ok := s.protectedBlocker(p); ok && st == "waiting_for_job" {
358
out["waiting_for"] = map[string]any{"job_id": blk.ID, "job_name": blk.Name, "pipeline_id": blk.PipelineID}
359
}
356
360
if st == "canceled" {
357
361
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)
358
362
out["cancel_reason"] = "manual"
@@ -368,7 +372,7 @@ func (s *Server) jobJSON(ctx context.Context, j store.Job) map[string]any {
368
372
out := map[string]any{
369
373
"id": j.ID, "name": j.Name, "stage": j.Stage, "status": j.Status, "when": j.When,
370
374
"allow_failure": j.AllowFailure, "started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt),
371
"runner": nil, "display_status": j.Status, "cancel_reason": nil, "failure_reason": nil,
375
"runner": nil, "do_not_interrupt": j.DoNotInterrupt, "display_status": j.Status, "cancel_reason": nil, "failure_reason": nil,
372
376
}
373
377
if r := j.CancelReason(); r != "" {
374
378
out["cancel_reason"] = r
@@ -492,7 +496,7 @@ func (s *Server) apiCancelPipeline(w http.ResponseWriter, r *http.Request) {
492
496
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))
493
497
return
494
498
}
495
if !s.apiOK(w, r, s.opCancelPipeline(r.Context(), apiUser(r), repo, id)) {
499
if !s.apiOK(w, r, s.opCancelPipeline(r.Context(), apiUser(r), repo, id, forceParam(r))) {
496
500
return
497
501
}
498
502
if p, err := s.Store.PipelineByID(r.Context(), repo.ID, id); err == nil {
@@ -553,7 +557,7 @@ func (s *Server) apiJobAction(w http.ResponseWriter, r *http.Request, action str
553
557
if !ok {
554
558
return
555
559
}
556
updated, err := s.opJobAction(r.Context(), apiUser(r), repo, p.ID, job.ID, action)
560
updated, err := s.opJobActionForce(r.Context(), apiUser(r), repo, p.ID, job.ID, action, action == "cancel" && forceParam(r))
557
561
if !s.apiOK(w, r, err) {
558
562
return
559
563
}
@@ -353,6 +353,10 @@ func (s *Server) pipeJSONJobs(ctx context.Context, repo store.Repo, p store.Pipe353
st := s.pipeStatusFor(p)353
st := s.pipeStatusFor(p)354
out["display_status"] = st354
out["display_status"] = st355
out["cancel_reason"] = nil355
out["cancel_reason"] = nil356
out["waiting_for"] = nil357
if blk, ok := s.protectedBlocker(p); ok && st == "waiting_for_job" {358
out["waiting_for"] = map[string]any{"job_id": blk.ID, "job_name": blk.Name, "pipeline_id": blk.PipelineID}359
}356
if st == "canceled" {360
if st == "canceled" {357
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)361
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)358
out["cancel_reason"] = "manual"362
out["cancel_reason"] = "manual"@@ -368,7 +372,7 @@ func (s *Server) jobJSON(ctx context.Context, j store.Job) map[string]any {368
out := map[string]any{372
out := map[string]any{369
"id": j.ID, "name": j.Name, "stage": j.Stage, "status": j.Status, "when": j.When,373
"id": j.ID, "name": j.Name, "stage": j.Stage, "status": j.Status, "when": j.When,370
"allow_failure": j.AllowFailure, "started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt),374
"allow_failure": j.AllowFailure, "started_at": rfcTime(j.StartedAt), "finished_at": rfcTime(j.FinishedAt),371
"runner": nil, "display_status": j.Status, "cancel_reason": nil, "failure_reason": nil,375
"runner": nil, "do_not_interrupt": j.DoNotInterrupt, "display_status": j.Status, "cancel_reason": nil, "failure_reason": nil,372
}376
}373
if r := j.CancelReason(); r != "" {377
if r := j.CancelReason(); r != "" {374
out["cancel_reason"] = r378
out["cancel_reason"] = r@@ -492,7 +496,7 @@ func (s *Server) apiCancelPipeline(w http.ResponseWriter, r *http.Request) {492
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))496
s.writeAPIErr(w, r, fail(404, i18n.E("err.notFound")))493
return497
return494
}498
}495
if !s.apiOK(w, r, s.opCancelPipeline(r.Context(), apiUser(r), repo, id)) {499
if !s.apiOK(w, r, s.opCancelPipeline(r.Context(), apiUser(r), repo, id, forceParam(r))) {496
return500
return497
}501
}498
if p, err := s.Store.PipelineByID(r.Context(), repo.ID, id); err == nil {502
if p, err := s.Store.PipelineByID(r.Context(), repo.ID, id); err == nil {@@ -553,7 +557,7 @@ func (s *Server) apiJobAction(w http.ResponseWriter, r *http.Request, action str553
if !ok {557
if !ok {554
return558
return555
}559
}556
updated, err := s.opJobAction(r.Context(), apiUser(r), repo, p.ID, job.ID, action)560
updated, err := s.opJobActionForce(r.Context(), apiUser(r), repo, p.ID, job.ID, action, action == "cancel" && forceParam(r))557
if !s.apiOK(w, r, err) {561
if !s.apiOK(w, r, err) {558
return562
return559
}563
}@@ -234,6 +234,7 @@ func apiSchemas() map[string]any {
234
234
"status": str("Pipeline status. A pipeline stopped by a newer pipeline stays canceled; see cancel_reason."),
235
235
"display_status": str("Status as the UI shows it: obsolete when every canceled job was superseded by a newer pipeline on the same ref, otherwise equal to status. Only in list and get responses."),
236
236
"cancel_reason": str("For status canceled: superseded (a newer pipeline started for the same ref) or manual. Null otherwise. Only in list and get responses."),
237
"waiting_for": map[string]any{"type": "object", "nullable": true, "description": "For status waiting_for_job: the running doNotInterrupt job (job_id, job_name, pipeline_id) in an older pipeline on the same ref that this pipeline waits for. Only in list and get responses."},
237
238
"source": str("Trigger source."),
238
239
"actor": str("Username that started the pipeline."),
239
240
"created_at": when,
@@ -252,17 +253,18 @@ func apiSchemas() map[string]any {
252
253
},
253
254
}),
254
255
"Job": obj("CI job.", map[string]any{
255
"id": integer("Job id."),
256
"name": str("Job name."),
257
"stage": str("Stage name."),
258
"status": str("Job status."),
259
"when": str("When the job runs."),
260
"display_status": str("Status as the UI shows it: obsolete for a job canceled because a newer pipeline started for the same ref, otherwise equal to status."),
261
"cancel_reason": str("For status canceled: superseded or manual. Null otherwise."),
262
"failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),
263
"allow_failure": boolean("A failed job does not fail the pipeline."),
264
"started_at": when,
265
"finished_at": when,
256
"id": integer("Job id."),
257
"name": str("Job name."),
258
"stage": str("Stage name."),
259
"status": str("Job status."),
260
"when": str("When the job runs."),
261
"display_status": str("Status as the UI shows it: obsolete for a job canceled because a newer pipeline started for the same ref, otherwise equal to status."),
262
"cancel_reason": str("For status canceled: superseded or manual. Null otherwise."),
263
"do_not_interrupt": boolean("doNotInterrupt is set: the job is never stopped automatically, and cancelling it while it runs needs force=true."),
264
"failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),
265
"allow_failure": boolean("A failed job does not fail the pipeline."),
266
"started_at": when,
267
"finished_at": when,
266
268
}),
267
269
"Branch": obj("Branch tip. Create and rename responses only include name.", map[string]any{
268
270
"name": str("Branch name."),
@@ -234,6 +234,7 @@ func apiSchemas() map[string]any {234
"status": str("Pipeline status. A pipeline stopped by a newer pipeline stays canceled; see cancel_reason."),234
"status": str("Pipeline status. A pipeline stopped by a newer pipeline stays canceled; see cancel_reason."),235
"display_status": str("Status as the UI shows it: obsolete when every canceled job was superseded by a newer pipeline on the same ref, otherwise equal to status. Only in list and get responses."),235
"display_status": str("Status as the UI shows it: obsolete when every canceled job was superseded by a newer pipeline on the same ref, otherwise equal to status. Only in list and get responses."),236
"cancel_reason": str("For status canceled: superseded (a newer pipeline started for the same ref) or manual. Null otherwise. Only in list and get responses."),236
"cancel_reason": str("For status canceled: superseded (a newer pipeline started for the same ref) or manual. Null otherwise. Only in list and get responses."),237
"waiting_for": map[string]any{"type": "object", "nullable": true, "description": "For status waiting_for_job: the running doNotInterrupt job (job_id, job_name, pipeline_id) in an older pipeline on the same ref that this pipeline waits for. Only in list and get responses."},237
"source": str("Trigger source."),238
"source": str("Trigger source."),238
"actor": str("Username that started the pipeline."),239
"actor": str("Username that started the pipeline."),239
"created_at": when,240
"created_at": when,@@ -252,17 +253,18 @@ func apiSchemas() map[string]any {252
},253
},253
}),254
}),254
"Job": obj("CI job.", map[string]any{255
"Job": obj("CI job.", map[string]any{255
"id": integer("Job id."),256
"id": integer("Job id."),256
"name": str("Job name."),257
"name": str("Job name."),257
"stage": str("Stage name."),258
"stage": str("Stage name."),258
"status": str("Job status."),259
"status": str("Job status."),259
"when": str("When the job runs."),260
"when": str("When the job runs."),260
"display_status": str("Status as the UI shows it: obsolete for a job canceled because a newer pipeline started for the same ref, otherwise equal to status."),261
"display_status": str("Status as the UI shows it: obsolete for a job canceled because a newer pipeline started for the same ref, otherwise equal to status."),261
"cancel_reason": str("For status canceled: superseded or manual. Null otherwise."),262
"cancel_reason": str("For status canceled: superseded or manual. Null otherwise."),262
"failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),263
"do_not_interrupt": boolean("doNotInterrupt is set: the job is never stopped automatically, and cancelling it while it runs needs force=true."),263
"allow_failure": boolean("A failed job does not fail the pipeline."),264
"failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),264
"started_at": when,265
"allow_failure": boolean("A failed job does not fail the pipeline."),265
"finished_at": when,266
"started_at": when,267
"finished_at": when,266
}),268
}),267
"Branch": obj("Branch tip. Create and rename responses only include name.", map[string]any{269
"Branch": obj("Branch tip. Create and rename responses only include name.", map[string]any{268
"name": str("Branch name."),270
"name": str("Branch name."),@@ -21,7 +21,7 @@ var apiCatalog = []apiRoute{
21
21
{http.MethodPut, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause global runner", (*Server).apiRunnerPut},
22
22
{http.MethodPost, "/api/v1/admin/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause global runner", (*Server).apiRunnerPause},
23
23
{http.MethodPost, "/api/v1/admin/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume global runner", (*Server).apiRunnerResume},
24
{http.MethodDelete, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke global runner", (*Server).apiRunnerDelete},
24
{http.MethodDelete, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke global runner. 409 while it runs a doNotInterrupt job, unless force=true.", (*Server).apiRunnerDelete},
25
25
{http.MethodGet, "/api/v1/admin/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of global runner", (*Server).apiRunnerJobs},
26
26
{http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},
27
27
{http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},
@@ -84,7 +84,7 @@ var apiCatalog = []apiRoute{
84
84
{http.MethodPost, "/api/v1/projects", access.ScopeWrite, authUser, "Create project", (*Server).apiCreateProject},
85
85
{http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authOptional, "Get project", (*Server).apiGetProject},
86
86
{http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},
87
{http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project", (*Server).apiDeleteProject},
87
{http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiDeleteProject},
88
88
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},
89
89
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authOptional, "Project logo", (*Server).apiProjectLogo},
90
90
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeWrite, authUser, "Upload project logo", (*Server).apiProjectLogo},
@@ -144,14 +144,14 @@ var apiCatalog = []apiRoute{
144
144
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authOptional, "List pipelines, newest first. Optional query: sha (7-40 hex, prefix), ref (branch, tag or full ref), mr (merge request number; its pipelines plus pushes to its source branch).", (*Server).apiPipelines},
145
145
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeWrite, authUser, "Start pipeline", (*Server).apiPipelines},
146
146
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authOptional, "Get pipeline", (*Server).apiPipeline},
147
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline", (*Server).apiCancelPipeline},
147
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiCancelPipeline},
148
148
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/retry", access.ScopeWrite, authUser, "Retry pipeline", (*Server).apiRetryPipeline},
149
149
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authOptional, "List jobs", (*Server).apiJobs},
150
150
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authOptional, "Get job", (*Server).apiJob},
151
151
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authOptional, "Job log", (*Server).apiJobLog},
152
152
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/play", access.ScopeWrite, authUser, "Play manual job", (*Server).apiPlayJob},
153
153
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/retry", access.ScopeWrite, authUser, "Retry job", (*Server).apiRetryJob},
154
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job", (*Server).apiCancelJob},
154
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job. A running doNotInterrupt job needs force=true in the query, otherwise 409.", (*Server).apiCancelJob},
155
155
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authOptional, "List artifacts", (*Server).apiArtifacts},
156
156
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authOptional, "Download artifact", (*Server).apiArtifact},
157
157
@@ -21,7 +21,7 @@ var apiCatalog = []apiRoute{21
{http.MethodPut, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause global runner", (*Server).apiRunnerPut},21
{http.MethodPut, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Rename or pause global runner", (*Server).apiRunnerPut},22
{http.MethodPost, "/api/v1/admin/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause global runner", (*Server).apiRunnerPause},22
{http.MethodPost, "/api/v1/admin/runners/{id}/pause", access.ScopeRunnerWrite, authUser, "Pause global runner", (*Server).apiRunnerPause},23
{http.MethodPost, "/api/v1/admin/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume global runner", (*Server).apiRunnerResume},23
{http.MethodPost, "/api/v1/admin/runners/{id}/resume", access.ScopeRunnerWrite, authUser, "Resume global runner", (*Server).apiRunnerResume},24
{http.MethodDelete, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke global runner", (*Server).apiRunnerDelete},24
{http.MethodDelete, "/api/v1/admin/runners/{id}", access.ScopeRunnerWrite, authUser, "Revoke global runner. 409 while it runs a doNotInterrupt job, unless force=true.", (*Server).apiRunnerDelete},25
{http.MethodGet, "/api/v1/admin/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of global runner", (*Server).apiRunnerJobs},25
{http.MethodGet, "/api/v1/admin/runners/{id}/jobs", access.ScopeRunnerRead, authUser, "Recent jobs of global runner", (*Server).apiRunnerJobs},26
{http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},26
{http.MethodGet, "/api/v1/user/runners", access.ScopeRunnerRead, authUser, "List account runners", (*Server).apiRunners},27
{http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},27
{http.MethodPost, "/api/v1/user/runners/registration-token", access.ScopeRunnerWrite, authUser, "Create account runner registration token", (*Server).apiRunnerRegToken},@@ -84,7 +84,7 @@ var apiCatalog = []apiRoute{84
{http.MethodPost, "/api/v1/projects", access.ScopeWrite, authUser, "Create project", (*Server).apiCreateProject},84
{http.MethodPost, "/api/v1/projects", access.ScopeWrite, authUser, "Create project", (*Server).apiCreateProject},85
{http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authOptional, "Get project", (*Server).apiGetProject},85
{http.MethodGet, "/api/v1/projects/{owner}/{repo}", access.ScopeRepoRead, authOptional, "Get project", (*Server).apiGetProject},86
{http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},86
{http.MethodPut, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Update project", (*Server).apiPutProject},87
{http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project", (*Server).apiDeleteProject},87
{http.MethodDelete, "/api/v1/projects/{owner}/{repo}", access.ScopeWrite, authUser, "Delete project. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiDeleteProject},88
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},88
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/star", access.ScopeWrite, authUser, "Toggle star", (*Server).apiStar},89
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authOptional, "Project logo", (*Server).apiProjectLogo},89
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeRepoRead, authOptional, "Project logo", (*Server).apiProjectLogo},90
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeWrite, authUser, "Upload project logo", (*Server).apiProjectLogo},90
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/logo", access.ScopeWrite, authUser, "Upload project logo", (*Server).apiProjectLogo},@@ -144,14 +144,14 @@ var apiCatalog = []apiRoute{144
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authOptional, "List pipelines, newest first. Optional query: sha (7-40 hex, prefix), ref (branch, tag or full ref), mr (merge request number; its pipelines plus pushes to its source branch).", (*Server).apiPipelines},144
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeRead, authOptional, "List pipelines, newest first. Optional query: sha (7-40 hex, prefix), ref (branch, tag or full ref), mr (merge request number; its pipelines plus pushes to its source branch).", (*Server).apiPipelines},145
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeWrite, authUser, "Start pipeline", (*Server).apiPipelines},145
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines", access.ScopeWrite, authUser, "Start pipeline", (*Server).apiPipelines},146
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authOptional, "Get pipeline", (*Server).apiPipeline},146
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}", access.ScopeRead, authOptional, "Get pipeline", (*Server).apiPipeline},147
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline", (*Server).apiCancelPipeline},147
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/cancel", access.ScopeWrite, authUser, "Cancel pipeline. A running doNotInterrupt job makes this 409 unless the query has force=true.", (*Server).apiCancelPipeline},148
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/retry", access.ScopeWrite, authUser, "Retry pipeline", (*Server).apiRetryPipeline},148
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/retry", access.ScopeWrite, authUser, "Retry pipeline", (*Server).apiRetryPipeline},149
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authOptional, "List jobs", (*Server).apiJobs},149
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs", access.ScopeRead, authOptional, "List jobs", (*Server).apiJobs},150
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authOptional, "Get job", (*Server).apiJob},150
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}", access.ScopeRead, authOptional, "Get job", (*Server).apiJob},151
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authOptional, "Job log", (*Server).apiJobLog},151
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/log", access.ScopeRead, authOptional, "Job log", (*Server).apiJobLog},152
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/play", access.ScopeWrite, authUser, "Play manual job", (*Server).apiPlayJob},152
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/play", access.ScopeWrite, authUser, "Play manual job", (*Server).apiPlayJob},153
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/retry", access.ScopeWrite, authUser, "Retry job", (*Server).apiRetryJob},153
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/retry", access.ScopeWrite, authUser, "Retry job", (*Server).apiRetryJob},154
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job", (*Server).apiCancelJob},154
{http.MethodPost, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/cancel", access.ScopeWrite, authUser, "Cancel job. A running doNotInterrupt job needs force=true in the query, otherwise 409.", (*Server).apiCancelJob},155
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authOptional, "List artifacts", (*Server).apiArtifacts},155
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts", access.ScopeRead, authOptional, "List artifacts", (*Server).apiArtifacts},156
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authOptional, "Download artifact", (*Server).apiArtifact},156
{http.MethodGet, "/api/v1/projects/{owner}/{repo}/pipelines/{id}/jobs/{job}/artifacts/{path...}", access.ScopeRead, authOptional, "Download artifact", (*Server).apiArtifact},157
157
@@ -0,0 +1,153 @@
1
package server
2
3
import (
4
"context"
5
"net/http"
6
"net/http/cookiejar"
7
"net/http/httptest"
8
"net/url"
9
"os/exec"
10
"path/filepath"
11
"strings"
12
"testing"
13
14
"gitlab.com/Timfa/bluegit/internal/auth"
15
"gitlab.com/Timfa/bluegit/internal/config"
16
"gitlab.com/Timfa/bluegit/internal/store"
17
)
18
19
func TestDoNotInterrupt(t *testing.T) {
20
if _, err := exec.LookPath("git"); err != nil {
21
t.Skip("git ontbreekt")
22
}
23
storage := t.TempDir()
24
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
25
if err != nil {
26
t.Fatal(err)
27
}
28
t.Cleanup(func() { _ = st.Close() })
29
cfg := config.Config{
30
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
31
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
32
Git: config.Git{Binary: "git", DefaultBranch: "master"},
33
}
34
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
35
ts := httptest.NewServer(srv.Handler())
36
t.Cleanup(ts.Close)
37
jar, _ := cookiejar.New(nil)
38
tim := &http.Client{Jar: jar}
39
page := read(t, mustGet(t, tim, ts.URL+"/login"))
40
if _, err := tim.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"dni"}, "visibility": {"private"}}); err != nil {
41
t.Fatal(err)
42
}
43
ctx := context.Background()
44
repo, err := st.RepoByPath(ctx, "tim", "dni")
45
if err != nil {
46
t.Fatal(err)
47
}
48
user, _ := st.UpsertUser(ctx, 1, "tim", "", false)
49
ref := "refs/heads/master"
50
old, _ := st.CreatePipeline(ctx, repo.ID, "aaa", ref, "push", "tim", "oud", []store.NewJob{
51
{Name: "upload", Stage: "deploy", Script: "true", Interruptible: true, DoNotInterrupt: true},
52
{Name: "na", Stage: "post", Script: "true", Interruptible: true},
53
})
54
oldJobs, _ := st.JobsByPipeline(ctx, old)
55
up := oldJobs[0]
56
if ok, err := st.MarkJobRunning(ctx, up.ID); err != nil || !ok {
57
t.Fatal("running", err)
58
}
59
newer, _ := st.CreatePipeline(ctx, repo.ID, "bbb", ref, "push", "tim", "nieuw", []store.NewJob{{Name: "upload", Stage: "deploy", Script: "true"}})
60
61
// Auto-cancel slaat de lopende doNotInterrupt-job over; de wachtende job wordt obsolete.
62
running, _, err := st.CancelInterruptible(ctx, repo.ID, ref, newer)
63
if err != nil || len(running) != 0 {
64
t.Fatalf("lopende dni-job mag niet onderbroken worden: %v %v", running, err)
65
}
66
oldJobs, _ = st.JobsByPipeline(ctx, old)
67
if oldJobs[0].Status != "running" || !oldJobs[1].Obsolete() {
68
t.Fatalf("oud: %s %s/%s", oldJobs[0].Status, oldJobs[1].Status, oldJobs[1].Reason)
69
}
70
71
// De nieuwe pipeline wacht, met reden.
72
np, _ := st.PipelineByID(ctx, repo.ID, newer)
73
if !srv.HoldPipeline(np) || srv.pipeStatusFor(np) != "waiting_for_job" {
74
t.Fatalf("wacht niet: %s", srv.pipeStatusFor(np))
75
}
76
op, _ := st.PipelineByID(ctx, repo.ID, old)
77
if srv.HoldPipeline(op) {
78
t.Fatal("de oude pipeline wacht niet op zichzelf")
79
}
80
html := read(t, mustGet(t, tim, ts.URL+"/tim/dni/-/pipelines/"+itoa(newer)))
81
if !strings.Contains(html, "pipewait") || !strings.Contains(html, "upload") {
82
t.Fatal("wachtreden ontbreekt op de pipelinepagina")
83
}
84
85
// Handmatig annuleren vraagt om force.
86
if _, err := srv.opJobActionForce(ctx, user, repo, old, up.ID, "cancel", false); err == nil || statusOf(err) != 409 {
87
t.Fatalf("cancel zonder force: %v", err)
88
}
89
if err := srv.opCancelPipeline(ctx, user, repo, old, false); err == nil || statusOf(err) != 409 {
90
t.Fatalf("pipeline cancel zonder force: %v", err)
91
}
92
if err := srv.opDeleteRepo(ctx, user, repo, "dni", false); err == nil || statusOf(err) != 409 {
93
t.Fatalf("repo verwijderen: %v", err)
94
}
95
// Een aparte runner met deze job intrekken wordt geweigerd.
96
tok, err := st.CreateRunnerRegToken(ctx, "user", user.ID, user.ID)
97
if err != nil {
98
t.Fatal(err)
99
}
100
rn, _, err := st.RegisterRunner(ctx, tok, "remote", "test")
101
if err != nil {
102
t.Fatal(err)
103
}
104
if err := st.SetJobRunner(ctx, up.ID, rn.ID, rn.Name); err != nil {
105
t.Fatal(err)
106
}
107
if err := srv.revokeRunner(ctx, "user", user.ID, rn.ID, false); err == nil || statusOf(err) != 409 {
108
t.Fatalf("runner intrekken: %v", err)
109
}
110
// De UI toont het waarschuwingsvenster met force.
111
html = read(t, mustGet(t, tim, ts.URL+"/tim/dni/-/pipelines/"+itoa(old)+"/jobs/"+itoa(up.ID)))
112
if !strings.Contains(html, `name="force" value="1"`) || !strings.Contains(html, "doNotInterrupt") || !strings.Contains(html, `class="pill dni"`) {
113
t.Fatal("waarschuwing of badge ontbreekt op de jobpagina")
114
}
115
// Formulier zonder force: job blijft lopen; met force=1: geannuleerd.
116
cancelURL := ts.URL + "/tim/dni/-/pipelines/" + itoa(old) + "/jobs/" + itoa(up.ID) + "/cancel"
117
if _, err := tim.PostForm(cancelURL, url.Values{"csrf": {csrfOf(t, html)}}); err != nil {
118
t.Fatal(err)
119
}
120
if j, _ := st.JobByID(ctx, repo.ID, up.ID); j.Status != "running" {
121
t.Fatalf("zonder force gestopt: %s", j.Status)
122
}
123
if _, err := tim.PostForm(cancelURL, url.Values{"csrf": {csrfOf(t, html)}, "force": {"1"}}); err != nil {
124
t.Fatal(err)
125
}
126
if j, _ := st.JobByID(ctx, repo.ID, up.ID); j.Status != "canceled" || j.CancelReason() != "manual" {
127
t.Fatalf("met force: %s %s", j.Status, j.Reason)
128
}
129
np, _ = st.PipelineByID(ctx, repo.ID, newer)
130
if srv.HoldPipeline(np) {
131
t.Fatal("na afloop hoort de nieuwe pipeline te starten")
132
}
133
}
134
135
func TestDoNotInterruptDefaultOff(t *testing.T) {
136
jobs := []store.Job{{Name: "a", Status: "running"}}
137
if len(store.ProtectedRunning(jobs)) != 0 {
138
t.Fatal("standaard uit")
139
}
140
tr := func(k string, a ...any) string { return k }
141
v := cancelView(tr, "Cancel", "ask", jobs)
142
if v == nil || v.Force || v.Ask != "ask" {
143
t.Fatalf("gewone job: %+v", v)
144
}
145
jobs[0].DoNotInterrupt = true
146
v = cancelView(tr, "Cancel", "ask", jobs)
147
if !v.Force || v.Ask != "pipe.cancelDNI" {
148
t.Fatalf("dni-job: %+v", v)
149
}
150
if cancelView(tr, "Cancel", "ask", []store.Job{{Status: "success"}}) != nil {
151
t.Fatal("niets te annuleren")
152
}
153
}
@@ -0,0 +1,153 @@1
package server2
3
import (4
"context"5
"net/http"6
"net/http/cookiejar"7
"net/http/httptest"8
"net/url"9
"os/exec"10
"path/filepath"11
"strings"12
"testing"13
14
"gitlab.com/Timfa/bluegit/internal/auth"15
"gitlab.com/Timfa/bluegit/internal/config"16
"gitlab.com/Timfa/bluegit/internal/store"17
)18
19
func TestDoNotInterrupt(t *testing.T) {20
if _, err := exec.LookPath("git"); err != nil {21
t.Skip("git ontbreekt")22
}23
storage := t.TempDir()24
st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())25
if err != nil {26
t.Fatal(err)27
}28
t.Cleanup(func() { _ = st.Close() })29
cfg := config.Config{30
BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,31
Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},32
Git: config.Git{Binary: "git", DefaultBranch: "master"},33
}34
srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}35
ts := httptest.NewServer(srv.Handler())36
t.Cleanup(ts.Close)37
jar, _ := cookiejar.New(nil)38
tim := &http.Client{Jar: jar}39
page := read(t, mustGet(t, tim, ts.URL+"/login"))40
if _, err := tim.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrfOf(t, page)}, "name": {"dni"}, "visibility": {"private"}}); err != nil {41
t.Fatal(err)42
}43
ctx := context.Background()44
repo, err := st.RepoByPath(ctx, "tim", "dni")45
if err != nil {46
t.Fatal(err)47
}48
user, _ := st.UpsertUser(ctx, 1, "tim", "", false)49
ref := "refs/heads/master"50
old, _ := st.CreatePipeline(ctx, repo.ID, "aaa", ref, "push", "tim", "oud", []store.NewJob{51
{Name: "upload", Stage: "deploy", Script: "true", Interruptible: true, DoNotInterrupt: true},52
{Name: "na", Stage: "post", Script: "true", Interruptible: true},53
})54
oldJobs, _ := st.JobsByPipeline(ctx, old)55
up := oldJobs[0]56
if ok, err := st.MarkJobRunning(ctx, up.ID); err != nil || !ok {57
t.Fatal("running", err)58
}59
newer, _ := st.CreatePipeline(ctx, repo.ID, "bbb", ref, "push", "tim", "nieuw", []store.NewJob{{Name: "upload", Stage: "deploy", Script: "true"}})60
61
// Auto-cancel slaat de lopende doNotInterrupt-job over; de wachtende job wordt obsolete.62
running, _, err := st.CancelInterruptible(ctx, repo.ID, ref, newer)63
if err != nil || len(running) != 0 {64
t.Fatalf("lopende dni-job mag niet onderbroken worden: %v %v", running, err)65
}66
oldJobs, _ = st.JobsByPipeline(ctx, old)67
if oldJobs[0].Status != "running" || !oldJobs[1].Obsolete() {68
t.Fatalf("oud: %s %s/%s", oldJobs[0].Status, oldJobs[1].Status, oldJobs[1].Reason)69
}70
71
// De nieuwe pipeline wacht, met reden.72
np, _ := st.PipelineByID(ctx, repo.ID, newer)73
if !srv.HoldPipeline(np) || srv.pipeStatusFor(np) != "waiting_for_job" {74
t.Fatalf("wacht niet: %s", srv.pipeStatusFor(np))75
}76
op, _ := st.PipelineByID(ctx, repo.ID, old)77
if srv.HoldPipeline(op) {78
t.Fatal("de oude pipeline wacht niet op zichzelf")79
}80
html := read(t, mustGet(t, tim, ts.URL+"/tim/dni/-/pipelines/"+itoa(newer)))81
if !strings.Contains(html, "pipewait") || !strings.Contains(html, "upload") {82
t.Fatal("wachtreden ontbreekt op de pipelinepagina")83
}84
85
// Handmatig annuleren vraagt om force.86
if _, err := srv.opJobActionForce(ctx, user, repo, old, up.ID, "cancel", false); err == nil || statusOf(err) != 409 {87
t.Fatalf("cancel zonder force: %v", err)88
}89
if err := srv.opCancelPipeline(ctx, user, repo, old, false); err == nil || statusOf(err) != 409 {90
t.Fatalf("pipeline cancel zonder force: %v", err)91
}92
if err := srv.opDeleteRepo(ctx, user, repo, "dni", false); err == nil || statusOf(err) != 409 {93
t.Fatalf("repo verwijderen: %v", err)94
}95
// Een aparte runner met deze job intrekken wordt geweigerd.96
tok, err := st.CreateRunnerRegToken(ctx, "user", user.ID, user.ID)97
if err != nil {98
t.Fatal(err)99
}100
rn, _, err := st.RegisterRunner(ctx, tok, "remote", "test")101
if err != nil {102
t.Fatal(err)103
}104
if err := st.SetJobRunner(ctx, up.ID, rn.ID, rn.Name); err != nil {105
t.Fatal(err)106
}107
if err := srv.revokeRunner(ctx, "user", user.ID, rn.ID, false); err == nil || statusOf(err) != 409 {108
t.Fatalf("runner intrekken: %v", err)109
}110
// De UI toont het waarschuwingsvenster met force.111
html = read(t, mustGet(t, tim, ts.URL+"/tim/dni/-/pipelines/"+itoa(old)+"/jobs/"+itoa(up.ID)))112
if !strings.Contains(html, `name="force" value="1"`) || !strings.Contains(html, "doNotInterrupt") || !strings.Contains(html, `class="pill dni"`) {113
t.Fatal("waarschuwing of badge ontbreekt op de jobpagina")114
}115
// Formulier zonder force: job blijft lopen; met force=1: geannuleerd.116
cancelURL := ts.URL + "/tim/dni/-/pipelines/" + itoa(old) + "/jobs/" + itoa(up.ID) + "/cancel"117
if _, err := tim.PostForm(cancelURL, url.Values{"csrf": {csrfOf(t, html)}}); err != nil {118
t.Fatal(err)119
}120
if j, _ := st.JobByID(ctx, repo.ID, up.ID); j.Status != "running" {121
t.Fatalf("zonder force gestopt: %s", j.Status)122
}123
if _, err := tim.PostForm(cancelURL, url.Values{"csrf": {csrfOf(t, html)}, "force": {"1"}}); err != nil {124
t.Fatal(err)125
}126
if j, _ := st.JobByID(ctx, repo.ID, up.ID); j.Status != "canceled" || j.CancelReason() != "manual" {127
t.Fatalf("met force: %s %s", j.Status, j.Reason)128
}129
np, _ = st.PipelineByID(ctx, repo.ID, newer)130
if srv.HoldPipeline(np) {131
t.Fatal("na afloop hoort de nieuwe pipeline te starten")132
}133
}134
135
func TestDoNotInterruptDefaultOff(t *testing.T) {136
jobs := []store.Job{{Name: "a", Status: "running"}}137
if len(store.ProtectedRunning(jobs)) != 0 {138
t.Fatal("standaard uit")139
}140
tr := func(k string, a ...any) string { return k }141
v := cancelView(tr, "Cancel", "ask", jobs)142
if v == nil || v.Force || v.Ask != "ask" {143
t.Fatalf("gewone job: %+v", v)144
}145
jobs[0].DoNotInterrupt = true146
v = cancelView(tr, "Cancel", "ask", jobs)147
if !v.Force || v.Ask != "pipe.cancelDNI" {148
t.Fatalf("dni-job: %+v", v)149
}150
if cancelView(tr, "Cancel", "ask", []store.Job{{Status: "success"}}) != nil {151
t.Fatal("niets te annuleren")152
}153
}@@ -82,7 +82,7 @@ func (s *Server) planPipeline(ctx context.Context, repo store.Repo, sha, ref, so
82
82
AllowFailure: j.AllowFailure, When: j.When, Timeout: j.Timeout, Tags: j.Tags,
83
83
CachePaths: j.Cache.Paths, CacheKey: j.Cache.Key, ResourceGroup: j.ResourceGroup,
84
84
RetryMax: j.Retry.Max, RetryWhen: j.Retry.When, Services: services,
85
Environment: j.Environment.Name, EnvironmentURL: j.Environment.URL, Interruptible: j.Interruptible,
85
Environment: j.Environment.Name, EnvironmentURL: j.Environment.URL, Interruptible: j.Interruptible, DoNotInterrupt: j.DoNotInterrupt,
86
86
})
87
87
}
88
88
return title, jobs, nil
@@ -82,7 +82,7 @@ func (s *Server) planPipeline(ctx context.Context, repo store.Repo, sha, ref, so82
AllowFailure: j.AllowFailure, When: j.When, Timeout: j.Timeout, Tags: j.Tags,82
AllowFailure: j.AllowFailure, When: j.When, Timeout: j.Timeout, Tags: j.Tags,83
CachePaths: j.Cache.Paths, CacheKey: j.Cache.Key, ResourceGroup: j.ResourceGroup,83
CachePaths: j.Cache.Paths, CacheKey: j.Cache.Key, ResourceGroup: j.ResourceGroup,84
RetryMax: j.Retry.Max, RetryWhen: j.Retry.When, Services: services,84
RetryMax: j.Retry.Max, RetryWhen: j.Retry.When, Services: services,85
Environment: j.Environment.Name, EnvironmentURL: j.Environment.URL, Interruptible: j.Interruptible,85
Environment: j.Environment.Name, EnvironmentURL: j.Environment.URL, Interruptible: j.Interruptible, DoNotInterrupt: j.DoNotInterrupt,86
})86
})87
}87
}88
return title, jobs, nil88
return title, jobs, nil@@ -5,6 +5,7 @@ import (
5
5
"net/http"
6
6
"os"
7
7
"path/filepath"
8
"strconv"
8
9
"strings"
9
10
10
11
"gitlab.com/Timfa/bluegit/internal/access"
@@ -36,6 +37,11 @@ func (s *Server) opRunPipeline(ctx context.Context, user store.User, repo store.
36
37
}
37
38
38
39
func (s *Server) opJobAction(ctx context.Context, user store.User, repo store.Repo, pipeID, jobID int64, action string) (store.Job, error) {
40
return s.opJobActionForce(ctx, user, repo, pipeID, jobID, action, false)
41
}
42
43
// opJobActionForce: force is nodig om een lopende doNotInterrupt-job te annuleren.
44
func (s *Server) opJobActionForce(ctx context.Context, user store.User, repo store.Repo, pipeID, jobID int64, action string, force bool) (store.Job, error) {
39
45
role, err := s.repoRole(ctx, user, repo)
40
46
if err != nil {
41
47
return store.Job{}, err
@@ -78,6 +84,9 @@ func (s *Server) opJobAction(ctx context.Context, user store.User, repo store.Re
78
84
return store.Job{}, fail(409, i18n.E("err.jobState"))
79
85
}
80
86
case "cancel":
87
if job.Status == "running" && job.DoNotInterrupt && !force {
88
return store.Job{}, fail(409, i18n.E("err.doNotInterrupt", job.Name))
89
}
81
90
ok, err := s.Store.CancelJob(ctx, job.ID)
82
91
if err != nil {
83
92
return store.Job{}, fail(400, err)
@@ -148,7 +157,7 @@ func (s *Server) opRetryPipeline(ctx context.Context, user store.User, repo stor
148
157
}
149
158
}
150
159
151
func (s *Server) opCancelPipeline(ctx context.Context, user store.User, repo store.Repo, pipeID int64) error {
160
func (s *Server) opCancelPipeline(ctx context.Context, user store.User, repo store.Repo, pipeID int64, force bool) error {
152
161
role, err := s.repoRole(ctx, user, repo)
153
162
if err != nil {
154
163
return err
@@ -161,6 +170,9 @@ func (s *Server) opCancelPipeline(ctx context.Context, user store.User, repo sto
161
170
return notFound(err)
162
171
}
163
172
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)
173
if prot := store.ProtectedRunning(jobs); len(prot) > 0 && !force {
174
return fail(409, i18n.E("err.doNotInterrupt", jobNames(prot)))
175
}
164
176
var running []int64
165
177
for _, j := range jobs {
166
178
if j.Status == "queued" || j.Status == "running" || j.Status == "manual" || j.Status == "pending" || j.Status == "created" {
@@ -308,3 +320,37 @@ func (s *Server) opCIFile(ctx context.Context, repo store.Repo, ref string) (str
308
320
body := gitOne(ctx, s.Git, dir, "show", ref+":"+ciFile)
309
321
return body, nil
310
322
}
323
324
// jobNames noemt jobs als "a", "b" voor meldingen.
325
func jobNames(jobs []store.Job) string {
326
names := make([]string, 0, len(jobs))
327
for _, j := range jobs {
328
names = append(names, strconv.Quote(j.Name))
329
}
330
return strings.Join(names, ", ")
331
}
332
333
// forceParam leest force=true|1 uit query of formulier.
334
func forceParam(r *http.Request) bool {
335
v := r.URL.Query().Get("force")
336
if v == "" {
337
v = r.FormValue("force")
338
}
339
return v == "true" || v == "1"
340
}
341
342
// revokeRunner trekt een aparte runner in, behalve als hij een lopende
343
// doNotInterrupt-job heeft en force uit staat.
344
func (s *Server) revokeRunner(ctx context.Context, kind string, owner, id int64, force bool) error {
345
if prot, _ := s.Store.RunningProtectedJobs(ctx, 0, id); len(prot) > 0 && !force {
346
return fail(409, i18n.E("err.dniRunnerRevoke", jobNames(prot)))
347
}
348
return s.Store.RevokeRunner(ctx, kind, owner, id)
349
}
350
351
func (s *Server) revokeErr(r *http.Request, err error) string {
352
if statusOf(err) == http.StatusConflict {
353
return i18n.Text(s.langOf(r), err)
354
}
355
return s.tr(r, "runner.missing")
356
}
@@ -5,6 +5,7 @@ import (5
"net/http"5
"net/http"6
"os"6
"os"7
"path/filepath"7
"path/filepath"8
"strconv"8
"strings"9
"strings"9
10
10
"gitlab.com/Timfa/bluegit/internal/access"11
"gitlab.com/Timfa/bluegit/internal/access"@@ -36,6 +37,11 @@ func (s *Server) opRunPipeline(ctx context.Context, user store.User, repo store.36
}37
}37
38
38
func (s *Server) opJobAction(ctx context.Context, user store.User, repo store.Repo, pipeID, jobID int64, action string) (store.Job, error) {39
func (s *Server) opJobAction(ctx context.Context, user store.User, repo store.Repo, pipeID, jobID int64, action string) (store.Job, error) {40
return s.opJobActionForce(ctx, user, repo, pipeID, jobID, action, false)41
}42
43
// opJobActionForce: force is nodig om een lopende doNotInterrupt-job te annuleren.44
func (s *Server) opJobActionForce(ctx context.Context, user store.User, repo store.Repo, pipeID, jobID int64, action string, force bool) (store.Job, error) {39
role, err := s.repoRole(ctx, user, repo)45
role, err := s.repoRole(ctx, user, repo)40
if err != nil {46
if err != nil {41
return store.Job{}, err47
return store.Job{}, err@@ -78,6 +84,9 @@ func (s *Server) opJobAction(ctx context.Context, user store.User, repo store.Re78
return store.Job{}, fail(409, i18n.E("err.jobState"))84
return store.Job{}, fail(409, i18n.E("err.jobState"))79
}85
}80
case "cancel":86
case "cancel":87
if job.Status == "running" && job.DoNotInterrupt && !force {88
return store.Job{}, fail(409, i18n.E("err.doNotInterrupt", job.Name))89
}81
ok, err := s.Store.CancelJob(ctx, job.ID)90
ok, err := s.Store.CancelJob(ctx, job.ID)82
if err != nil {91
if err != nil {83
return store.Job{}, fail(400, err)92
return store.Job{}, fail(400, err)@@ -148,7 +157,7 @@ func (s *Server) opRetryPipeline(ctx context.Context, user store.User, repo stor148
}157
}149
}158
}150
159
151
func (s *Server) opCancelPipeline(ctx context.Context, user store.User, repo store.Repo, pipeID int64) error {160
func (s *Server) opCancelPipeline(ctx context.Context, user store.User, repo store.Repo, pipeID int64, force bool) error {152
role, err := s.repoRole(ctx, user, repo)161
role, err := s.repoRole(ctx, user, repo)153
if err != nil {162
if err != nil {154
return err163
return err@@ -161,6 +170,9 @@ func (s *Server) opCancelPipeline(ctx context.Context, user store.User, repo sto161
return notFound(err)170
return notFound(err)162
}171
}163
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)172
jobs, _ := s.Store.JobsByPipeline(ctx, p.ID)173
if prot := store.ProtectedRunning(jobs); len(prot) > 0 && !force {174
return fail(409, i18n.E("err.doNotInterrupt", jobNames(prot)))175
}164
var running []int64176
var running []int64165
for _, j := range jobs {177
for _, j := range jobs {166
if j.Status == "queued" || j.Status == "running" || j.Status == "manual" || j.Status == "pending" || j.Status == "created" {178
if j.Status == "queued" || j.Status == "running" || j.Status == "manual" || j.Status == "pending" || j.Status == "created" {@@ -308,3 +320,37 @@ func (s *Server) opCIFile(ctx context.Context, repo store.Repo, ref string) (str308
body := gitOne(ctx, s.Git, dir, "show", ref+":"+ciFile)320
body := gitOne(ctx, s.Git, dir, "show", ref+":"+ciFile)309
return body, nil321
return body, nil310
}322
}323
324
// jobNames noemt jobs als "a", "b" voor meldingen.325
func jobNames(jobs []store.Job) string {326
names := make([]string, 0, len(jobs))327
for _, j := range jobs {328
names = append(names, strconv.Quote(j.Name))329
}330
return strings.Join(names, ", ")331
}332
333
// forceParam leest force=true|1 uit query of formulier.334
func forceParam(r *http.Request) bool {335
v := r.URL.Query().Get("force")336
if v == "" {337
v = r.FormValue("force")338
}339
return v == "true" || v == "1"340
}341
342
// revokeRunner trekt een aparte runner in, behalve als hij een lopende343
// doNotInterrupt-job heeft en force uit staat.344
func (s *Server) revokeRunner(ctx context.Context, kind string, owner, id int64, force bool) error {345
if prot, _ := s.Store.RunningProtectedJobs(ctx, 0, id); len(prot) > 0 && !force {346
return fail(409, i18n.E("err.dniRunnerRevoke", jobNames(prot)))347
}348
return s.Store.RevokeRunner(ctx, kind, owner, id)349
}350
351
func (s *Server) revokeErr(r *http.Request, err error) string {352
if statusOf(err) == http.StatusConflict {353
return i18n.Text(s.langOf(r), err)354
}355
return s.tr(r, "runner.missing")356
}@@ -156,7 +156,7 @@ func (s *Server) opSetReleaseVisibility(ctx context.Context, user store.User, re
156
156
return nil
157
157
}
158
158
159
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string) error {
159
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string, force bool) error {
160
160
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)
161
161
if err != nil || !role.CanManageSettings() {
162
162
return fail(403, i18n.E("err.forbidden"))
@@ -164,6 +164,9 @@ func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.R
164
164
if confirm != repo.Name {
165
165
return fail(400, i18n.E("err.confirmDelete"))
166
166
}
167
if prot, _ := s.Store.RunningProtectedJobs(ctx, repo.ID, 0); len(prot) > 0 && !force {
168
return fail(409, i18n.E("err.dniRepoDelete", jobNames(prot)))
169
}
167
170
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)
168
171
if err := s.Store.DeleteRepo(ctx, repo.ID); err != nil {
169
172
return fail(400, err)
@@ -156,7 +156,7 @@ func (s *Server) opSetReleaseVisibility(ctx context.Context, user store.User, re156
return nil156
return nil157
}157
}158
158
159
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string) error {159
func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.Repo, confirm string, force bool) error {160
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)160
role, err := s.Store.EffectiveRole(ctx, user.ID, repo.ID)161
if err != nil || !role.CanManageSettings() {161
if err != nil || !role.CanManageSettings() {162
return fail(403, i18n.E("err.forbidden"))162
return fail(403, i18n.E("err.forbidden"))@@ -164,6 +164,9 @@ func (s *Server) opDeleteRepo(ctx context.Context, user store.User, repo store.R164
if confirm != repo.Name {164
if confirm != repo.Name {165
return fail(400, i18n.E("err.confirmDelete"))165
return fail(400, i18n.E("err.confirmDelete"))166
}166
}167
if prot, _ := s.Store.RunningProtectedJobs(ctx, repo.ID, 0); len(prot) > 0 && !force {168
return fail(409, i18n.E("err.dniRepoDelete", jobNames(prot)))169
}167
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)170
dir := gitrepo.Dir(s.StoragePath(), repo.OwnerPath, repo.Name)168
if err := s.Store.DeleteRepo(ctx, repo.ID); err != nil {171
if err := s.Store.DeleteRepo(ctx, repo.ID); err != nil {169
return fail(400, err)172
return fail(400, err)@@ -57,6 +57,74 @@ type JobLink struct {
57
57
Queue string
58
58
Current bool
59
59
Stage string
60
// DNI: doNotInterrupt staat aan (badge met tooltip).
61
DNI bool
62
}
63
64
// CancelView is een annuleerknop met eigen bevestigingsvenster. Force staat
65
// aan als er een lopende doNotInterrupt-job bij is; de vraag waarschuwt dan.
66
type CancelView struct {
67
Label string
68
Ask string
69
OK string
70
Force bool
71
}
72
73
// cancelView bouwt de knop voor jobs die gestopt zouden worden; nil als er
74
// niets te annuleren valt.
75
func cancelView(tr func(string, ...any) string, label, ask string, jobs []store.Job) *CancelView {
76
open := false
77
for _, j := range jobs {
78
switch j.Status {
79
case "queued", "running", "manual", "created", "pending":
80
open = true
81
}
82
}
83
if !open {
84
return nil
85
}
86
v := &CancelView{Label: label, Ask: ask, OK: label}
87
if prot := store.ProtectedRunning(jobs); len(prot) > 0 {
88
v.Ask = tr("pipe.cancelDNI", jobNames(prot))
89
v.OK = tr("pipe.cancelDNIOk")
90
v.Force = true
91
}
92
return v
93
}
94
95
func (s *Server) cancelJobWeb(w http.ResponseWriter, r *http.Request) {
96
u, repo, _, ok := s.guard(w, r, access.RoleDeveloper)
97
if !ok || !s.csrfOK(w, r) {
98
return
99
}
100
p, job, ok := s.jobFromRequest(w, r, repo)
101
if !ok {
102
return
103
}
104
back := repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10) + "/jobs/" + strconv.FormatInt(job.ID, 10)
105
if _, err := s.opJobActionForce(r.Context(), u, repo, p.ID, job.ID, "cancel", forceParam(r)); err != nil {
106
s.redirect(w, r, back, "", i18n.Text(s.langOf(r), err))
107
return
108
}
109
s.redirect(w, r, back, s.tr(r, "flash.canceled"), "")
110
}
111
112
func (s *Server) cancelPipelineWeb(w http.ResponseWriter, r *http.Request) {
113
u, repo, _, ok := s.guard(w, r, access.RoleDeveloper)
114
if !ok || !s.csrfOK(w, r) {
115
return
116
}
117
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)
118
if err != nil {
119
http.NotFound(w, r)
120
return
121
}
122
back := repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(id, 10)
123
if err := s.opCancelPipeline(r.Context(), u, repo, id, forceParam(r)); err != nil {
124
s.redirect(w, r, back, "", i18n.Text(s.langOf(r), err))
125
return
126
}
127
s.redirect(w, r, back, s.tr(r, "flash.canceled"), "")
60
128
}
61
129
62
130
// JobPage is de console van één job.
@@ -89,6 +157,7 @@ type JobPage struct {
89
157
Blocks []LogBlock
90
158
Running bool
91
159
LogBytes int
160
Cancel *CancelView
92
161
CanPlay bool
93
162
Environment string
94
163
EnvironmentURL string
@@ -270,6 +339,8 @@ func displayStatus(pipe string, jobs []store.Job) string {
270
339
return "canceled"
271
340
case "waiting_for_update":
272
341
return "waiting_for_update"
342
case "waiting_for_job":
343
return "waiting_for_job"
273
344
}
274
345
warn := false
275
346
for _, j := range jobs {
@@ -620,6 +691,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
620
691
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
621
692
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",
622
693
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),
694
Cancel: jobCancel(tr, role.CanWriteCode(), job),
623
695
Queue: queueText(tr, ranks, job.ID),
624
696
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),
625
697
}
@@ -712,7 +784,7 @@ func linksFor(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) str
712
784
st := jobDisplay(j)
713
785
out = append(out, JobLink{
714
786
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,
715
Queue: queueText(tr, ranks, j.ID),
787
Queue: queueText(tr, ranks, j.ID), DNI: j.DoNotInterrupt,
716
788
})
717
789
}
718
790
return out
@@ -838,3 +910,10 @@ func clockOf(ts string) string {
838
910
}
839
911
return ""
840
912
}
913
914
func jobCancel(tr func(string, ...any) string, can bool, job store.Job) *CancelView {
915
if !can {
916
return nil
917
}
918
return cancelView(tr, tr("pipe.cancelJob"), tr("pipe.cancelAsk"), []store.Job{job})
919
}
@@ -57,6 +57,74 @@ type JobLink struct {57
Queue string57
Queue string58
Current bool58
Current bool59
Stage string59
Stage string60
// DNI: doNotInterrupt staat aan (badge met tooltip).61
DNI bool62
}63
64
// CancelView is een annuleerknop met eigen bevestigingsvenster. Force staat65
// aan als er een lopende doNotInterrupt-job bij is; de vraag waarschuwt dan.66
type CancelView struct {67
Label string68
Ask string69
OK string70
Force bool71
}72
73
// cancelView bouwt de knop voor jobs die gestopt zouden worden; nil als er74
// niets te annuleren valt.75
func cancelView(tr func(string, ...any) string, label, ask string, jobs []store.Job) *CancelView {76
open := false77
for _, j := range jobs {78
switch j.Status {79
case "queued", "running", "manual", "created", "pending":80
open = true81
}82
}83
if !open {84
return nil85
}86
v := &CancelView{Label: label, Ask: ask, OK: label}87
if prot := store.ProtectedRunning(jobs); len(prot) > 0 {88
v.Ask = tr("pipe.cancelDNI", jobNames(prot))89
v.OK = tr("pipe.cancelDNIOk")90
v.Force = true91
}92
return v93
}94
95
func (s *Server) cancelJobWeb(w http.ResponseWriter, r *http.Request) {96
u, repo, _, ok := s.guard(w, r, access.RoleDeveloper)97
if !ok || !s.csrfOK(w, r) {98
return99
}100
p, job, ok := s.jobFromRequest(w, r, repo)101
if !ok {102
return103
}104
back := repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(p.ID, 10) + "/jobs/" + strconv.FormatInt(job.ID, 10)105
if _, err := s.opJobActionForce(r.Context(), u, repo, p.ID, job.ID, "cancel", forceParam(r)); err != nil {106
s.redirect(w, r, back, "", i18n.Text(s.langOf(r), err))107
return108
}109
s.redirect(w, r, back, s.tr(r, "flash.canceled"), "")110
}111
112
func (s *Server) cancelPipelineWeb(w http.ResponseWriter, r *http.Request) {113
u, repo, _, ok := s.guard(w, r, access.RoleDeveloper)114
if !ok || !s.csrfOK(w, r) {115
return116
}117
id, err := strconv.ParseInt(r.PathValue("id"), 10, 64)118
if err != nil {119
http.NotFound(w, r)120
return121
}122
back := repoURL(repo) + "/-/pipelines/" + strconv.FormatInt(id, 10)123
if err := s.opCancelPipeline(r.Context(), u, repo, id, forceParam(r)); err != nil {124
s.redirect(w, r, back, "", i18n.Text(s.langOf(r), err))125
return126
}127
s.redirect(w, r, back, s.tr(r, "flash.canceled"), "")60
}128
}61
129
62
// JobPage is de console van één job.130
// JobPage is de console van één job.@@ -89,6 +157,7 @@ type JobPage struct {89
Blocks []LogBlock157
Blocks []LogBlock90
Running bool158
Running bool91
LogBytes int159
LogBytes int160
Cancel *CancelView92
CanPlay bool161
CanPlay bool93
Environment string162
Environment string94
EnvironmentURL string163
EnvironmentURL string@@ -270,6 +339,8 @@ func displayStatus(pipe string, jobs []store.Job) string {270
return "canceled"339
return "canceled"271
case "waiting_for_update":340
case "waiting_for_update":272
return "waiting_for_update"341
return "waiting_for_update"342
case "waiting_for_job":343
return "waiting_for_job"273
}344
}274
warn := false345
warn := false275
for _, j := range jobs {346
for _, j := range jobs {@@ -620,6 +691,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job620
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),691
PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),621
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",692
Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",622
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),693
LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),694
Cancel: jobCancel(tr, role.CanWriteCode(), job),623
Queue: queueText(tr, ranks, job.ID),695
Queue: queueText(tr, ranks, job.ID),624
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),696
Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),625
}697
}@@ -712,7 +784,7 @@ func linksFor(jobs []store.Job, ranks map[int64]int, tr func(string, ...any) str712
st := jobDisplay(j)784
st := jobDisplay(j)713
out = append(out, JobLink{785
out = append(out, JobLink{714
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,786
ID: j.ID, Name: j.Name, Status: st, Label: tr("pipe." + st), Stage: j.Stage,715
Queue: queueText(tr, ranks, j.ID),787
Queue: queueText(tr, ranks, j.ID), DNI: j.DoNotInterrupt,716
})788
})717
}789
}718
return out790
return out@@ -838,3 +910,10 @@ func clockOf(ts string) string {838
}910
}839
return ""911
return ""840
}912
}913
914
func jobCancel(tr func(string, ...any) string, can bool, job store.Job) *CancelView {915
if !can {916
return nil917
}918
return cancelView(tr, tr("pipe.cancelJob"), tr("pipe.cancelAsk"), []store.Job{job})919
}@@ -160,7 +160,7 @@ func TestReadCacheClearKeepsData(t *testing.T) {
160
160
repo := repoOf(t, srv, "cached")
161
161
srv.ReadCache().PutJSON(repo.ID, false, "x", 1)
162
162
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")
163
if err := srv.opDeleteRepo(context.Background(), tim, repo, "cached"); err != nil {
163
if err := srv.opDeleteRepo(context.Background(), tim, repo, "cached", false); err != nil {
164
164
t.Fatal(err)
165
165
}
166
166
if srv.ReadCache().Usage().Entries != 0 {
@@ -160,7 +160,7 @@ func TestReadCacheClearKeepsData(t *testing.T) {160
repo := repoOf(t, srv, "cached")160
repo := repoOf(t, srv, "cached")161
srv.ReadCache().PutJSON(repo.ID, false, "x", 1)161
srv.ReadCache().PutJSON(repo.ID, false, "x", 1)162
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")162
tim, _ := srv.Store.UserByUsername(context.Background(), "tim")163
if err := srv.opDeleteRepo(context.Background(), tim, repo, "cached"); err != nil {163
if err := srv.opDeleteRepo(context.Background(), tim, repo, "cached", false); err != nil {164
t.Fatal(err)164
t.Fatal(err)165
}165
}166
if srv.ReadCache().Usage().Entries != 0 {166
if srv.ReadCache().Usage().Entries != 0 {@@ -390,7 +390,13 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {
390
390
v.Jobs = jobs
391
391
ranks := s.queueRanks(r.Context())
392
392
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }
393
v.PipeStatus = displayStatus(p.Status, jobs)
393
v.PipeStatus = displayStatus(s.pipeStatusFor(p), jobs)
394
if blk, ok := s.protectedBlocker(p); ok {
395
v.PipeWait = tr("pipe.waitingFor", strconv.Quote(blk.Name), blk.PipelineID)
396
}
397
if role.CanWriteCode() {
398
v.PipeCancel = cancelView(tr, tr("pipe.cancelPipeline"), tr("pipe.cancelPipeAsk"), jobs)
399
}
394
400
v.PipeLabel = tr("pipe." + v.PipeStatus)
395
401
v.PipeSource = s.pipelineSourceText(r, repo, p)
396
402
v.PipeJobs = linksFor(jobs, ranks, tr)
@@ -390,7 +390,13 @@ func (s *Server) pipeline(w http.ResponseWriter, r *http.Request) {390
v.Jobs = jobs390
v.Jobs = jobs391
ranks := s.queueRanks(r.Context())391
ranks := s.queueRanks(r.Context())392
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }392
tr := func(key string, args ...any) string { return s.tr(r, key, args...) }393
v.PipeStatus = displayStatus(p.Status, jobs)393
v.PipeStatus = displayStatus(s.pipeStatusFor(p), jobs)394
if blk, ok := s.protectedBlocker(p); ok {395
v.PipeWait = tr("pipe.waitingFor", strconv.Quote(blk.Name), blk.PipelineID)396
}397
if role.CanWriteCode() {398
v.PipeCancel = cancelView(tr, tr("pipe.cancelPipeline"), tr("pipe.cancelPipeAsk"), jobs)399
}394
v.PipeLabel = tr("pipe." + v.PipeStatus)400
v.PipeLabel = tr("pipe." + v.PipeStatus)395
v.PipeSource = s.pipelineSourceText(r, repo, p)401
v.PipeSource = s.pipelineSourceText(r, repo, p)396
v.PipeJobs = linksFor(jobs, ranks, tr)402
v.PipeJobs = linksFor(jobs, ranks, tr)@@ -102,8 +102,8 @@ func (s *Server) userRunnerDelete(w http.ResponseWriter, r *http.Request) {
102
102
return
103
103
}
104
104
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
105
if err := s.Store.RevokeRunner(r.Context(), "user", u.ID, id); err != nil {
106
s.redirect(w, r, "/settings#runners", "", s.tr(r, "runner.missing"))
105
if err := s.revokeRunner(r.Context(), "user", u.ID, id, false); err != nil {
106
s.redirect(w, r, "/settings#runners", "", s.revokeErr(r, err))
107
107
return
108
108
}
109
109
s.redirect(w, r, "/settings#runners", s.tr(r, "runner.revoked"), "")
@@ -156,8 +156,8 @@ func (s *Server) groupRunnerDelete(w http.ResponseWriter, r *http.Request) {
156
156
}
157
157
back := "/groups/" + g.Path + "?tab=settings#runners"
158
158
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)
159
if err := s.Store.RevokeRunner(r.Context(), "group", g.ID, id); err != nil {
160
s.redirect(w, r, back, "", s.tr(r, "runner.missing"))
159
if err := s.revokeRunner(r.Context(), "group", g.ID, id, false); err != nil {
160
s.redirect(w, r, back, "", s.revokeErr(r, err))
161
161
return
162
162
}
163
163
s.redirect(w, r, back, s.tr(r, "runner.revoked"), "")
@@ -102,8 +102,8 @@ func (s *Server) userRunnerDelete(w http.ResponseWriter, r *http.Request) {102
return102
return103
}103
}104
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)104
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)105
if err := s.Store.RevokeRunner(r.Context(), "user", u.ID, id); err != nil {105
if err := s.revokeRunner(r.Context(), "user", u.ID, id, false); err != nil {106
s.redirect(w, r, "/settings#runners", "", s.tr(r, "runner.missing"))106
s.redirect(w, r, "/settings#runners", "", s.revokeErr(r, err))107
return107
return108
}108
}109
s.redirect(w, r, "/settings#runners", s.tr(r, "runner.revoked"), "")109
s.redirect(w, r, "/settings#runners", s.tr(r, "runner.revoked"), "")@@ -156,8 +156,8 @@ func (s *Server) groupRunnerDelete(w http.ResponseWriter, r *http.Request) {156
}156
}157
back := "/groups/" + g.Path + "?tab=settings#runners"157
back := "/groups/" + g.Path + "?tab=settings#runners"158
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)158
id, _ := strconv.ParseInt(r.FormValue("id"), 10, 64)159
if err := s.Store.RevokeRunner(r.Context(), "group", g.ID, id); err != nil {159
if err := s.revokeRunner(r.Context(), "group", g.ID, id, false); err != nil {160
s.redirect(w, r, back, "", s.tr(r, "runner.missing"))160
s.redirect(w, r, back, "", s.revokeErr(r, err))161
return161
return162
}162
}163
s.redirect(w, r, back, s.tr(r, "runner.revoked"), "")163
s.redirect(w, r, back, s.tr(r, "runner.revoked"), "")@@ -145,7 +145,7 @@ func (s *Server) apiRunnerDelete(w http.ResponseWriter, r *http.Request) {
145
145
if !ok {
146
146
return
147
147
}
148
if !s.apiOK(w, r, s.Store.RevokeRunner(r.Context(), kind, owner, rn.ID)) {
148
if !s.apiOK(w, r, s.revokeRunner(r.Context(), kind, owner, rn.ID, forceParam(r))) {
149
149
return
150
150
}
151
151
w.WriteHeader(http.StatusNoContent)
@@ -145,7 +145,7 @@ func (s *Server) apiRunnerDelete(w http.ResponseWriter, r *http.Request) {145
if !ok {145
if !ok {146
return146
return147
}147
}148
if !s.apiOK(w, r, s.Store.RevokeRunner(r.Context(), kind, owner, rn.ID)) {148
if !s.apiOK(w, r, s.revokeRunner(r.Context(), kind, owner, rn.ID, forceParam(r))) {149
return149
return150
}150
}151
w.WriteHeader(http.StatusNoContent)151
w.WriteHeader(http.StatusNoContent)@@ -222,6 +222,8 @@ func (s *Server) Handler() http.Handler {
222
222
mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}/jobs/{job}", s.showJob)
223
223
mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/log", s.jobLog)
224
224
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/play", s.playJob)
225
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/cancel", s.cancelJobWeb)
226
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/cancel", s.cancelPipelineWeb)
225
227
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/retry", s.retryPipeline)
226
228
mux.HandleFunc("GET /{owner}/{repo}/-/ci/editor", s.ciEditor)
227
229
mux.HandleFunc("POST /{owner}/{repo}/-/ci/editor", s.saveCIEditor)
@@ -576,68 +578,72 @@ func randomState() (string, error) {
576
578
577
579
// View is de gegevensset voor elk scherm.
578
580
type View struct {
579
RunnerList []RunnerView
580
RunnerPref string
581
NewRunnerToken string
582
BuiltinFirst bool
583
RunnerOptIn bool
584
OptInNames []string
585
Title string
586
BaseURL string
587
RunnerName string
588
User *store.User
589
CSRF string
590
Notice string
591
Err string
592
Repos []store.Repo
593
Groups []store.Group
594
Repo *store.Repo
595
Role access.Role
596
CanWrite bool
597
CanAdmin bool
598
CanMerge bool
599
CanForce bool
600
CanComment bool
601
CanApply bool
602
Commits []CommitRow
603
CommitDays []CommitDay
604
CommitPrev string
605
CommitNext string
606
Commit *CommitRow
607
CommitDiff *CommitDiff
608
Entries []EntryRow
609
TreePath string
610
Blob string
611
BlobPath string
612
Binary bool
613
Branches []BranchRow
614
Branch *BranchBoard
615
MRs []store.MergeRequest
616
Flow *FlowBoard
617
MR *store.MergeRequest
618
Banner *MRBanner
619
MRPipe *PipeRow
620
MergeBlocks []string
621
Approval *ApprovalView
622
Reviews []ReviewRow
623
CanReview bool
624
CanApprove bool
625
CanDismiss bool
626
CanClose bool
627
CanReopen bool
628
IsOwner bool
629
Candidates []store.Member
630
Diff string
631
DiffFiles []DiffFileView
632
Pipes []store.Pipeline
633
PipeRows []PipeRow
634
Pipe *store.Pipeline
635
PipeSource string
636
PipeStatus string
637
PipeLabel string
638
PipeJobs []JobLink
639
PipeStages []StageView
640
PipeFailed bool
581
RunnerList []RunnerView
582
RunnerPref string
583
NewRunnerToken string
584
BuiltinFirst bool
585
RunnerOptIn bool
586
OptInNames []string
587
Title string
588
BaseURL string
589
RunnerName string
590
User *store.User
591
CSRF string
592
Notice string
593
Err string
594
Repos []store.Repo
595
Groups []store.Group
596
Repo *store.Repo
597
Role access.Role
598
CanWrite bool
599
CanAdmin bool
600
CanMerge bool
601
CanForce bool
602
CanComment bool
603
CanApply bool
604
Commits []CommitRow
605
CommitDays []CommitDay
606
CommitPrev string
607
CommitNext string
608
Commit *CommitRow
609
CommitDiff *CommitDiff
610
Entries []EntryRow
611
TreePath string
612
Blob string
613
BlobPath string
614
Binary bool
615
Branches []BranchRow
616
Branch *BranchBoard
617
MRs []store.MergeRequest
618
Flow *FlowBoard
619
MR *store.MergeRequest
620
Banner *MRBanner
621
MRPipe *PipeRow
622
MergeBlocks []string
623
Approval *ApprovalView
624
Reviews []ReviewRow
625
CanReview bool
626
CanApprove bool
627
CanDismiss bool
628
CanClose bool
629
CanReopen bool
630
IsOwner bool
631
Candidates []store.Member
632
Diff string
633
DiffFiles []DiffFileView
634
Pipes []store.Pipeline
635
PipeRows []PipeRow
636
Pipe *store.Pipeline
637
PipeSource string
638
PipeStatus string
639
PipeLabel string
640
PipeJobs []JobLink
641
PipeStages []StageView
642
PipeFailed bool
643
// PipeWait: waarom deze pipeline wacht (doNotInterrupt in een oudere pipeline).
644
PipeWait string
645
// PipeCancel: annuleerknop met bevestiging, nil als annuleren niet kan.
646
PipeCancel *CancelView
641
647
Live bool
642
648
LiveURL string
643
649
Jobs []store.Job
@@ -222,6 +222,8 @@ func (s *Server) Handler() http.Handler {222
mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}/jobs/{job}", s.showJob)222
mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}/jobs/{job}", s.showJob)223
mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/log", s.jobLog)223
mux.HandleFunc("GET /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/log", s.jobLog)224
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/play", s.playJob)224
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/play", s.playJob)225
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/jobs/{job}/cancel", s.cancelJobWeb)226
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/cancel", s.cancelPipelineWeb)225
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/retry", s.retryPipeline)227
mux.HandleFunc("POST /{owner}/{repo}/-/pipelines/{id}/retry", s.retryPipeline)226
mux.HandleFunc("GET /{owner}/{repo}/-/ci/editor", s.ciEditor)228
mux.HandleFunc("GET /{owner}/{repo}/-/ci/editor", s.ciEditor)227
mux.HandleFunc("POST /{owner}/{repo}/-/ci/editor", s.saveCIEditor)229
mux.HandleFunc("POST /{owner}/{repo}/-/ci/editor", s.saveCIEditor)@@ -576,68 +578,72 @@ func randomState() (string, error) {576
578
577
// View is de gegevensset voor elk scherm.579
// View is de gegevensset voor elk scherm.578
type View struct {580
type View struct {579
RunnerList []RunnerView581
RunnerList []RunnerView580
RunnerPref string582
RunnerPref string581
NewRunnerToken string583
NewRunnerToken string582
BuiltinFirst bool584
BuiltinFirst bool583
RunnerOptIn bool585
RunnerOptIn bool584
OptInNames []string586
OptInNames []string585
Title string587
Title string586
BaseURL string588
BaseURL string587
RunnerName string589
RunnerName string588
User *store.User590
User *store.User589
CSRF string591
CSRF string590
Notice string592
Notice string591
Err string593
Err string592
Repos []store.Repo594
Repos []store.Repo593
Groups []store.Group595
Groups []store.Group594
Repo *store.Repo596
Repo *store.Repo595
Role access.Role597
Role access.Role596
CanWrite bool598
CanWrite bool597
CanAdmin bool599
CanAdmin bool598
CanMerge bool600
CanMerge bool599
CanForce bool601
CanForce bool600
CanComment bool602
CanComment bool601
CanApply bool603
CanApply bool602
Commits []CommitRow604
Commits []CommitRow603
CommitDays []CommitDay605
CommitDays []CommitDay604
CommitPrev string606
CommitPrev string605
CommitNext string607
CommitNext string606
Commit *CommitRow608
Commit *CommitRow607
CommitDiff *CommitDiff609
CommitDiff *CommitDiff608
Entries []EntryRow610
Entries []EntryRow609
TreePath string611
TreePath string610
Blob string612
Blob string611
BlobPath string613
BlobPath string612
Binary bool614
Binary bool613
Branches []BranchRow615
Branches []BranchRow614
Branch *BranchBoard616
Branch *BranchBoard615
MRs []store.MergeRequest617
MRs []store.MergeRequest616
Flow *FlowBoard618
Flow *FlowBoard617
MR *store.MergeRequest619
MR *store.MergeRequest618
Banner *MRBanner620
Banner *MRBanner619
MRPipe *PipeRow621
MRPipe *PipeRow620
MergeBlocks []string622
MergeBlocks []string621
Approval *ApprovalView623
Approval *ApprovalView622
Reviews []ReviewRow624
Reviews []ReviewRow623
CanReview bool625
CanReview bool624
CanApprove bool626
CanApprove bool625
CanDismiss bool627
CanDismiss bool626
CanClose bool628
CanClose bool627
CanReopen bool629
CanReopen bool628
IsOwner bool630
IsOwner bool629
Candidates []store.Member631
Candidates []store.Member630
Diff string632
Diff string631
DiffFiles []DiffFileView633
DiffFiles []DiffFileView632
Pipes []store.Pipeline634
Pipes []store.Pipeline633
PipeRows []PipeRow635
PipeRows []PipeRow634
Pipe *store.Pipeline636
Pipe *store.Pipeline635
PipeSource string637
PipeSource string636
PipeStatus string638
PipeStatus string637
PipeLabel string639
PipeLabel string638
PipeJobs []JobLink640
PipeJobs []JobLink639
PipeStages []StageView641
PipeStages []StageView640
PipeFailed bool642
PipeFailed bool643
// PipeWait: waarom deze pipeline wacht (doNotInterrupt in een oudere pipeline).644
PipeWait string645
// PipeCancel: annuleerknop met bevestiging, nil als annuleren niet kan.646
PipeCancel *CancelView641
Live bool647
Live bool642
LiveURL string648
LiveURL string643
Jobs []store.Job649
Jobs []store.Job@@ -493,7 +493,7 @@ func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {
493
493
return
494
494
}
495
495
u := s.who(r).User
496
if err := s.opDeleteRepo(r.Context(), u, repo, r.FormValue("confirm")); err != nil {
496
if err := s.opDeleteRepo(r.Context(), u, repo, r.FormValue("confirm"), false); err != nil {
497
497
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))
498
498
return
499
499
}
@@ -493,7 +493,7 @@ func (s *Server) deleteRepo(w http.ResponseWriter, r *http.Request) {493
return493
return494
}494
}495
u := s.who(r).User495
u := s.who(r).User496
if err := s.opDeleteRepo(r.Context(), u, repo, r.FormValue("confirm")); err != nil {496
if err := s.opDeleteRepo(r.Context(), u, repo, r.FormValue("confirm"), false); err != nil {497
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))497
s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.commitProblem(r, err))498
return498
return499
}499
}@@ -311,9 +311,15 @@
311
311
// Obsolete-statussen krijgen hun uitleg als tooltip (data-tip) en
312
312
// aria-label, ook als pipeline.js de klasse live wijzigt.
313
313
(function () {
314
var tip = document.body.getAttribute("data-obsolete-tip") || "canceled because a newer pipeline started for the same ref";
315
function tag(root) {
316
var list = (root || document).querySelectorAll(".status.obsolete");
314
var tips = {
315
obsolete: document.body.getAttribute("data-obsolete-tip") || "canceled because a newer pipeline started for the same ref",
316
waiting_for_job: document.body.getAttribute("data-waitjob-tip") || "waiting for a non-interruptible job in an older pipeline on the same ref"
317
};
318
function tag() {
319
Object.keys(tips).forEach(function (cls) { tagOne(cls, tips[cls]); });
320
}
321
function tagOne(cls, tip) {
322
var list = document.querySelectorAll(".status." + cls);
317
323
Array.prototype.forEach.call(list, function (el) {
318
324
if (el.getAttribute("data-tip") !== tip) {
319
325
el.setAttribute("data-tip", tip);
@@ -323,7 +329,12 @@
323
329
});
324
330
}
325
331
function untag(el) {
326
if (el.classList && el.classList.contains("status") && !el.classList.contains("obsolete") && el.getAttribute("data-tip") === tip) {
332
if (!el.classList || !el.classList.contains("status")) {
333
return;
334
}
335
var t = el.getAttribute("data-tip");
336
var stale = Object.keys(tips).some(function (cls) { return t === tips[cls] && !el.classList.contains(cls); });
337
if (stale) {
327
338
el.removeAttribute("data-tip");
328
339
el.removeAttribute("aria-label");
329
340
}
@@ -311,9 +311,15 @@311
// Obsolete-statussen krijgen hun uitleg als tooltip (data-tip) en311
// Obsolete-statussen krijgen hun uitleg als tooltip (data-tip) en312
// aria-label, ook als pipeline.js de klasse live wijzigt.312
// aria-label, ook als pipeline.js de klasse live wijzigt.313
(function () {313
(function () {314
var tip = document.body.getAttribute("data-obsolete-tip") || "canceled because a newer pipeline started for the same ref";314
var tips = {315
function tag(root) {315
obsolete: document.body.getAttribute("data-obsolete-tip") || "canceled because a newer pipeline started for the same ref",316
var list = (root || document).querySelectorAll(".status.obsolete");316
waiting_for_job: document.body.getAttribute("data-waitjob-tip") || "waiting for a non-interruptible job in an older pipeline on the same ref"317
};318
function tag() {319
Object.keys(tips).forEach(function (cls) { tagOne(cls, tips[cls]); });320
}321
function tagOne(cls, tip) {322
var list = document.querySelectorAll(".status." + cls);317
Array.prototype.forEach.call(list, function (el) {323
Array.prototype.forEach.call(list, function (el) {318
if (el.getAttribute("data-tip") !== tip) {324
if (el.getAttribute("data-tip") !== tip) {319
el.setAttribute("data-tip", tip);325
el.setAttribute("data-tip", tip);@@ -323,7 +329,12 @@323
});329
});324
}330
}325
function untag(el) {331
function untag(el) {326
if (el.classList && el.classList.contains("status") && !el.classList.contains("obsolete") && el.getAttribute("data-tip") === tip) {332
if (!el.classList || !el.classList.contains("status")) {333
return;334
}335
var t = el.getAttribute("data-tip");336
var stale = Object.keys(tips).some(function (cls) { return t === tips[cls] && !el.classList.contains(cls); });337
if (stale) {327
el.removeAttribute("data-tip");338
el.removeAttribute("data-tip");328
el.removeAttribute("aria-label");339
el.removeAttribute("aria-label");329
}340
}@@ -660,7 +660,7 @@ svg.ico { width: 14px; height: 14px; flex: none; }
660
660
.skipped .mark::after, .canceled .mark::after {
661
661
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;
662
662
}
663
.status.pending .mark, .status.created .mark, .status.waiting_for_update .mark,
663
.status.pending .mark, .status.created .mark, .status.waiting_for_update .mark, .status.waiting_for_job .mark,
664
664
.stage-dot.pending .mark, .stage-dot.created .mark {
665
665
background: transparent;
666
666
box-shadow: inset 0 0 0 2px #8c959f;
@@ -1501,3 +1501,9 @@ li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center;
1501
1501
.imgpreview { margin: 0; padding: 1rem; display: flex; justify-content: center; }
1502
1502
.imgpreview img { max-width: 100%; height: auto; background-color: #fff; background-image: linear-gradient(45deg, #e6e9ef 25%, transparent 25%), linear-gradient(-45deg, #e6e9ef 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #e6e9ef 75%), linear-gradient(-45deg, transparent 75%, #e6e9ef 75%); background-size: 16px 16px; background-position: 0 0, 0 8px, 8px -8px, -8px 0; border: 1px solid var(--line); border-radius: 4px; }
1503
1503
.imgpreview img.pixel { image-rendering: pixelated; }
1504
1505
/* doNotInterrupt */
1506
.pill.dni { background: #fff4e0; color: #8a5a00; border: 1px solid #f0d9a8; font-size: 0.74rem; padding: 0 0.45rem; cursor: help; }
1507
.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }
1508
.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }
1509
form.cancelform { display: inline; }
@@ -660,7 +660,7 @@ svg.ico { width: 14px; height: 14px; flex: none; }660
.skipped .mark::after, .canceled .mark::after {660
.skipped .mark::after, .canceled .mark::after {661
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;661
content: ""; position: absolute; left: 4px; top: 7px; width: 8px; height: 2px; background: #fff;662
}662
}663
.status.pending .mark, .status.created .mark, .status.waiting_for_update .mark,663
.status.pending .mark, .status.created .mark, .status.waiting_for_update .mark, .status.waiting_for_job .mark,664
.stage-dot.pending .mark, .stage-dot.created .mark {664
.stage-dot.pending .mark, .stage-dot.created .mark {665
background: transparent;665
background: transparent;666
box-shadow: inset 0 0 0 2px #8c959f;666
box-shadow: inset 0 0 0 2px #8c959f;@@ -1501,3 +1501,9 @@ li.rel-asset form.rel-asset-actions { display: inline-flex; align-items: center;1501
.imgpreview { margin: 0; padding: 1rem; display: flex; justify-content: center; }1501
.imgpreview { margin: 0; padding: 1rem; display: flex; justify-content: center; }1502
.imgpreview img { max-width: 100%; height: auto; background-color: #fff; background-image: linear-gradient(45deg, #e6e9ef 25%, transparent 25%), linear-gradient(-45deg, #e6e9ef 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #e6e9ef 75%), linear-gradient(-45deg, transparent 75%, #e6e9ef 75%); background-size: 16px 16px; background-position: 0 0, 0 8px, 8px -8px, -8px 0; border: 1px solid var(--line); border-radius: 4px; }1502
.imgpreview img { max-width: 100%; height: auto; background-color: #fff; background-image: linear-gradient(45deg, #e6e9ef 25%, transparent 25%), linear-gradient(-45deg, #e6e9ef 25%, transparent 25%), linear-gradient(45deg, transparent 75%, #e6e9ef 75%), linear-gradient(-45deg, transparent 75%, #e6e9ef 75%); background-size: 16px 16px; background-position: 0 0, 0 8px, 8px -8px, -8px 0; border: 1px solid var(--line); border-radius: 4px; }1503
.imgpreview img.pixel { image-rendering: pixelated; }1503
.imgpreview img.pixel { image-rendering: pixelated; }1504
1505
/* doNotInterrupt */1506
.pill.dni { background: #fff4e0; color: #8a5a00; border: 1px solid #f0d9a8; font-size: 0.74rem; padding: 0 0.45rem; cursor: help; }1507
.pipewait { display: flex; align-items: center; gap: 0.5rem; flex-wrap: wrap; background: #fff8ec; border: 1px solid #f0d9a8; border-radius: 8px; padding: 0.5rem 0.75rem; }1508
.status.waiting_for_job { background: #fff4e0; color: #8a5a00; }1509
form.cancelform { display: inline; }@@ -345,14 +345,20 @@
345
345
{{template "layout-end" .}}
346
346
{{end}}
347
347
348
{{define "cancel-form"}}<form method="post" class="inline cancelform" action="{{.Action}}" data-confirm="{{.C.Ask}}" data-confirm-ok="{{.C.OK}}">
349
<input type="hidden" name="csrf" value="{{.CSRF}}">{{if .C.Force}}<input type="hidden" name="force" value="1">{{end}}
350
<button type="submit" class="ghost{{if .C.Force}} danger{{end}}">{{.C.Label}}</button>
351
</form>{{end}}
352
348
353
{{define "pipeline"}}
349
354
{{template "layout-start" .}}
350
355
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>
351
356
{{template "pipenav" .}}
352
<div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}</div>
357
<div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}{{if .PipeCancel}} {{template "cancel-form" (dict "C" .PipeCancel "CSRF" .CSRF "Action" (printf "/%s/-/pipelines/%d/cancel" .Repo.FullPath .Pipe.ID))}}{{end}}</div>
358
{{if .PipeWait}}<p class="pipewait" role="status"><span class="status waiting_for_job"><span class="mark"></span>{{t "pipe.waiting_for_job"}}</span> {{.PipeWait}}</p>{{end}}
353
359
<p class="muted">{{t "pipe.runningOn" .RunnerName}} · <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>
354
360
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>
355
{{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}}
361
{{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 .DNI}} <span class="pill dni" data-tip="{{t "pipe.dni.tip"}}" aria-label="{{t "pipe.dni.tip"}}">{{t "pipe.dni"}}</span>{{end}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}
356
362
</ul>
357
363
<script src="/assets/pipeline.js"></script>
358
364
{{template "layout-end" .}}
@@ -481,6 +487,8 @@
481
487
<ul class="related">
482
488
{{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}}
483
489
</ul>
490
{{if .Job.DoNotInterrupt}}<p><span class="pill dni" data-tip="{{t "pipe.dni.tip"}}" aria-label="{{t "pipe.dni.tip"}}">{{t "pipe.dni"}}</span></p>{{end}}
491
{{if .Cancel}}{{template "cancel-form" (dict "C" .Cancel "CSRF" $.CSRF "Action" (printf "/%s/-/pipelines/%d/jobs/%d/cancel" $.Repo.FullPath .Pipe.ID .Job.ID))}}{{end}}
484
492
{{if .CanPlay}}
485
493
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">
486
494
<input type="hidden" name="csrf" value="{{$.CSRF}}">
@@ -345,14 +345,20 @@345
{{template "layout-end" .}}345
{{template "layout-end" .}}346
{{end}}346
{{end}}347
347
348
{{define "cancel-form"}}<form method="post" class="inline cancelform" action="{{.Action}}" data-confirm="{{.C.Ask}}" data-confirm-ok="{{.C.OK}}">349
<input type="hidden" name="csrf" value="{{.CSRF}}">{{if .C.Force}}<input type="hidden" name="force" value="1">{{end}}350
<button type="submit" class="ghost{{if .C.Force}} danger{{end}}">{{.C.Label}}</button>351
</form>{{end}}352
348
{{define "pipeline"}}353
{{define "pipeline"}}349
{{template "layout-start" .}}354
{{template "layout-start" .}}350
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>355
<header class="pagehead"><h1>{{t "pipe.one"}} #{{.Pipe.ID}}</h1></header>351
{{template "pipenav" .}}356
{{template "pipenav" .}}352
<div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}</div>357
<div class="pipehead" data-pipe="{{.Pipe.ID}}"><span class="status {{.PipeStatus}}" data-pipe-status><span class="mark"></span><span data-pipe-label>{{.PipeLabel}}</span></span>{{if .PipeSource}} <span class="pill">{{.PipeSource}}</span>{{end}} {{.Pipe.Ref}} <a href="/{{.Repo.FullPath}}/-/commit/{{.Pipe.CommitSHA}}"><code>{{.Pipe.CommitSHA}}</code></a> {{template "pipe-retry" (dict "Can" .CanWrite "CSRF" .CSRF "Path" .Repo.FullPath "ID" .Pipe.ID "Failed" .PipeFailed "Back" (printf "/%s/-/pipelines/%d" .Repo.FullPath .Pipe.ID))}}{{if .PipeCancel}} {{template "cancel-form" (dict "C" .PipeCancel "CSRF" .CSRF "Action" (printf "/%s/-/pipelines/%d/cancel" .Repo.FullPath .Pipe.ID))}}{{end}}</div>358
{{if .PipeWait}}<p class="pipewait" role="status"><span class="status waiting_for_job"><span class="mark"></span>{{t "pipe.waiting_for_job"}}</span> {{.PipeWait}}</p>{{end}}353
<p class="muted">{{t "pipe.runningOn" .RunnerName}} · <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>359
<p class="muted">{{t "pipe.runningOn" .RunnerName}} · <a class="helplink" href="/help/runners">{{t "help.runnerDocs"}}</a></p>354
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>360
<ul class="clean"{{if .Live}} data-live="{{.LiveURL}}" data-live-on="1"{{end}}>355
{{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}}361
{{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 .DNI}} <span class="pill dni" data-tip="{{t "pipe.dni.tip"}}" aria-label="{{t "pipe.dni.tip"}}">{{t "pipe.dni"}}</span>{{end}}{{if .Queue}} <span class="queue" data-queue>{{.Queue}}</span>{{end}} <span class="muted">{{.Stage}}</span></li>{{end}}356
</ul>362
</ul>357
<script src="/assets/pipeline.js"></script>363
<script src="/assets/pipeline.js"></script>358
{{template "layout-end" .}}364
{{template "layout-end" .}}@@ -481,6 +487,8 @@481
<ul class="related">487
<ul class="related">482
{{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}}488
{{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}}483
</ul>489
</ul>490
{{if .Job.DoNotInterrupt}}<p><span class="pill dni" data-tip="{{t "pipe.dni.tip"}}" aria-label="{{t "pipe.dni.tip"}}">{{t "pipe.dni"}}</span></p>{{end}}491
{{if .Cancel}}{{template "cancel-form" (dict "C" .Cancel "CSRF" $.CSRF "Action" (printf "/%s/-/pipelines/%d/jobs/%d/cancel" $.Repo.FullPath .Pipe.ID .Job.ID))}}{{end}}484
{{if .CanPlay}}492
{{if .CanPlay}}485
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">493
<form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">486
<input type="hidden" name="csrf" value="{{$.CSRF}}">494
<input type="hidden" name="csrf" value="{{$.CSRF}}">@@ -26,7 +26,7 @@
26
26
<link rel="icon" href="/assets/logo.svg" type="image/svg+xml">
27
27
<link rel="stylesheet" href="/assets/style.css">
28
28
</head>
29
<body data-copied="{{t "action.copied"}}" data-modal-title="{{t "modal.title"}}" data-modal-ok="{{t "modal.ok"}}" data-modal-cancel="{{t "modal.cancel"}}" data-obsolete-tip="{{t "pipe.obsolete.tip"}}">
29
<body data-copied="{{t "action.copied"}}" data-modal-title="{{t "modal.title"}}" data-modal-ok="{{t "modal.ok"}}" data-modal-cancel="{{t "modal.cancel"}}" data-obsolete-tip="{{t "pipe.obsolete.tip"}}" data-waitjob-tip="{{t "pipe.waiting_for_job.tip"}}">
30
30
<header class="top">
31
31
<a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>
32
32
<nav>
@@ -26,7 +26,7 @@26
<link rel="icon" href="/assets/logo.svg" type="image/svg+xml">26
<link rel="icon" href="/assets/logo.svg" type="image/svg+xml">27
<link rel="stylesheet" href="/assets/style.css">27
<link rel="stylesheet" href="/assets/style.css">28
</head>28
</head>29
<body data-copied="{{t "action.copied"}}" data-modal-title="{{t "modal.title"}}" data-modal-ok="{{t "modal.ok"}}" data-modal-cancel="{{t "modal.cancel"}}" data-obsolete-tip="{{t "pipe.obsolete.tip"}}">29
<body data-copied="{{t "action.copied"}}" data-modal-title="{{t "modal.title"}}" data-modal-ok="{{t "modal.ok"}}" data-modal-cancel="{{t "modal.cancel"}}" data-obsolete-tip="{{t "pipe.obsolete.tip"}}" data-waitjob-tip="{{t "pipe.waiting_for_job.tip"}}">30
<header class="top">30
<header class="top">31
<a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>31
<a class="brand" href="/"><img src="/assets/logo.svg" alt=""> BlueGit</a>32
<nav>32
<nav>@@ -58,14 +58,32 @@ func (s *Server) UpdateGate() (bool, time.Time) {
58
58
// HoldPipeline is de runnerhaak: true = deze pipeline wacht op de update.
59
59
func (s *Server) HoldPipeline(p store.Pipeline) bool {
60
60
on, since := s.UpdateGate()
61
return on && !p.CreatedAt.Before(since)
61
if on && !p.CreatedAt.Before(since) {
62
return true
63
}
64
_, blocked := s.protectedBlocker(p)
65
return blocked
66
}
67
68
// protectedBlocker: een oudere pipeline op dezelfde ref heeft een lopende
69
// doNotInterrupt-job; deze pipeline start (nog) geen nieuwe jobs.
70
func (s *Server) protectedBlocker(p store.Pipeline) (store.Job, bool) {
71
if s.Store == nil || p.Status == "success" || p.Status == "failed" || p.Status == "canceled" {
72
return store.Job{}, false
73
}
74
return s.Store.ProtectedBlocker(context.Background(), p.RepoID, p.Ref, p.ID)
62
75
}
63
76
64
77
// pipeStatusFor geeft de status voor UI, API en scripts: een wachtende
65
78
// pipeline heet waiting_for_update.
66
79
func (s *Server) pipeStatusFor(p store.Pipeline) string {
67
if (p.Status == "queued" || p.Status == "created") && s.HoldPipeline(p) {
68
return "waiting_for_update"
80
if p.Status == "queued" || p.Status == "created" {
81
if on, since := s.UpdateGate(); on && !p.CreatedAt.Before(since) {
82
return "waiting_for_update"
83
}
84
if _, blocked := s.protectedBlocker(p); blocked {
85
return "waiting_for_job"
86
}
69
87
}
70
88
return p.Status
71
89
}
@@ -58,14 +58,32 @@ func (s *Server) UpdateGate() (bool, time.Time) {58
// HoldPipeline is de runnerhaak: true = deze pipeline wacht op de update.58
// HoldPipeline is de runnerhaak: true = deze pipeline wacht op de update.59
func (s *Server) HoldPipeline(p store.Pipeline) bool {59
func (s *Server) HoldPipeline(p store.Pipeline) bool {60
on, since := s.UpdateGate()60
on, since := s.UpdateGate()61
return on && !p.CreatedAt.Before(since)61
if on && !p.CreatedAt.Before(since) {62
return true63
}64
_, blocked := s.protectedBlocker(p)65
return blocked66
}67
68
// protectedBlocker: een oudere pipeline op dezelfde ref heeft een lopende69
// doNotInterrupt-job; deze pipeline start (nog) geen nieuwe jobs.70
func (s *Server) protectedBlocker(p store.Pipeline) (store.Job, bool) {71
if s.Store == nil || p.Status == "success" || p.Status == "failed" || p.Status == "canceled" {72
return store.Job{}, false73
}74
return s.Store.ProtectedBlocker(context.Background(), p.RepoID, p.Ref, p.ID)62
}75
}63
76
64
// pipeStatusFor geeft de status voor UI, API en scripts: een wachtende77
// pipeStatusFor geeft de status voor UI, API en scripts: een wachtende65
// pipeline heet waiting_for_update.78
// pipeline heet waiting_for_update.66
func (s *Server) pipeStatusFor(p store.Pipeline) string {79
func (s *Server) pipeStatusFor(p store.Pipeline) string {67
if (p.Status == "queued" || p.Status == "created") && s.HoldPipeline(p) {80
if p.Status == "queued" || p.Status == "created" {68
return "waiting_for_update"81
if on, since := s.UpdateGate(); on && !p.CreatedAt.Before(since) {82
return "waiting_for_update"83
}84
if _, blocked := s.protectedBlocker(p); blocked {85
return "waiting_for_job"86
}69
}87
}70
return p.Status88
return p.Status71
}89
}@@ -375,6 +375,7 @@ type NewJob struct {
375
375
Environment string
376
376
EnvironmentURL string
377
377
Interruptible bool
378
DoNotInterrupt bool
378
379
}
379
380
380
381
// Service is een sidecar die de runner naast de job start.
@@ -439,6 +440,7 @@ type Job struct {
439
440
Environment string
440
441
EnvironmentURL string
441
442
Interruptible bool
443
DoNotInterrupt bool
442
444
// Reason zegt waarom een job failed of canceled is: job_execution_timeout,
443
445
// script_failure, runner_system_failure, canceled_by_user,
444
446
// canceled_by_newer_pipeline. Leeg bij succes of onbekend (oude jobs).
@@ -791,11 +793,11 @@ func insertPipelineJobs(ctx context.Context, tx *sql.Tx, id, repoID int64, jobs
791
793
if j.When == "manual" {
792
794
status = "manual"
793
795
}
794
_, err := tx.ExecContext(ctx, `INSERT INTO jobs (pipeline_id, repo_id, name, stage, position, status, image, script, needs_json, needs_set, variables_json, artifact_paths, artifact_expire_seconds, allow_failure, log, before_script, after_script, when_mode, timeout_seconds, tags_json, cache_paths, cache_key, resource_group, optional_json, retry_max, retry_when, services_json, environment_name, environment_url, interruptible)
795
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
796
_, err := tx.ExecContext(ctx, `INSERT INTO jobs (pipeline_id, repo_id, name, stage, position, status, image, script, needs_json, needs_set, variables_json, artifact_paths, artifact_expire_seconds, allow_failure, log, before_script, after_script, when_mode, timeout_seconds, tags_json, cache_paths, cache_key, resource_group, optional_json, retry_max, retry_when, services_json, environment_name, environment_url, interruptible, do_not_interrupt)
797
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
796
798
id, repoID, j.Name, j.Stage, j.Position, status, j.Image, j.Script, mustJSON(j.Needs), boolInt(j.NeedsSet), mustJSON(j.Variables), mustJSON(j.ArtifactPaths), int(j.ArtifactExpire/time.Second), boolInt(j.AllowFailure),
797
799
j.Before, j.After, j.When, int(j.Timeout/time.Second), mustJSON(j.Tags), mustJSON(j.CachePaths), j.CacheKey, j.ResourceGroup, mustJSON(j.Optional),
798
j.RetryMax, mustJSON(j.RetryWhen), mustJSON(j.Services), j.Environment, j.EnvironmentURL, boolInt(j.Interruptible))
800
j.RetryMax, mustJSON(j.RetryWhen), mustJSON(j.Services), j.Environment, j.EnvironmentURL, boolInt(j.Interruptible), boolInt(j.DoNotInterrupt))
799
801
if err != nil {
800
802
return err
801
803
}
@@ -925,20 +927,21 @@ func (s *Store) JobsByPipeline(ctx context.Context, pipelineID int64) ([]Job, er
925
927
return out, rows.Err()
926
928
}
927
929
928
const jobSelect = `SELECT j.id, j.pipeline_id, j.repo_id, j.name, j.stage, j.position, j.status, j.image, j.script, j.needs_json, j.needs_set, j.variables_json, j.artifact_paths, j.artifact_expire_seconds, j.allow_failure, j.log, p.commit_sha, p.ref, j.before_script, j.after_script, j.when_mode, j.timeout_seconds, j.tags_json, j.cache_paths, j.cache_key, j.resource_group, j.optional_json, j.started_at, j.finished_at, j.retry_max, j.retry_when, j.attempt, j.services_json, j.environment_name, j.environment_url, j.interruptible, j.failure_reason
930
const jobSelect = `SELECT j.id, j.pipeline_id, j.repo_id, j.name, j.stage, j.position, j.status, j.image, j.script, j.needs_json, j.needs_set, j.variables_json, j.artifact_paths, j.artifact_expire_seconds, j.allow_failure, j.log, p.commit_sha, p.ref, j.before_script, j.after_script, j.when_mode, j.timeout_seconds, j.tags_json, j.cache_paths, j.cache_key, j.resource_group, j.optional_json, j.started_at, j.finished_at, j.retry_max, j.retry_when, j.attempt, j.services_json, j.environment_name, j.environment_url, j.interruptible, j.failure_reason, j.do_not_interrupt
929
931
FROM jobs j JOIN pipelines p ON p.id = j.pipeline_id`
930
932
931
933
func scanJob(rows *sql.Rows) (Job, error) {
932
934
var j Job
933
935
var needs, vars, paths, tags, cache, optional, retryWhen, services string
934
var needsSet, allow, expire, timeout, interruptible int
936
var needsSet, allow, expire, timeout, interruptible, dni int
935
937
var started, finished sql.NullString
936
if err := rows.Scan(&j.ID, &j.PipelineID, &j.RepoID, &j.Name, &j.Stage, &j.Position, &j.Status, &j.Image, &j.Script, &needs, &needsSet, &vars, &paths, &expire, &allow, &j.Log, &j.CommitSHA, &j.Ref, &j.Before, &j.After, &j.When, &timeout, &tags, &cache, &j.CacheKey, &j.ResourceGroup, &optional, &started, &finished, &j.RetryMax, &retryWhen, &j.Attempt, &services, &j.Environment, &j.EnvironmentURL, &interruptible, &j.Reason); err != nil {
938
if err := rows.Scan(&j.ID, &j.PipelineID, &j.RepoID, &j.Name, &j.Stage, &j.Position, &j.Status, &j.Image, &j.Script, &needs, &needsSet, &vars, &paths, &expire, &allow, &j.Log, &j.CommitSHA, &j.Ref, &j.Before, &j.After, &j.When, &timeout, &tags, &cache, &j.CacheKey, &j.ResourceGroup, &optional, &started, &finished, &j.RetryMax, &retryWhen, &j.Attempt, &services, &j.Environment, &j.EnvironmentURL, &interruptible, &j.Reason, &dni); err != nil {
937
939
return Job{}, err
938
940
}
939
941
j.NeedsSet = needsSet == 1
940
942
j.AllowFailure = allow == 1
941
943
j.Interruptible = interruptible == 1
944
j.DoNotInterrupt = dni == 1
942
945
j.ArtifactExpire = time.Duration(expire) * time.Second
943
946
j.Timeout = time.Duration(timeout) * time.Second
944
947
j.StartedAt = parseTime(started.String)
@@ -1075,7 +1078,8 @@ func (s *Store) RequeueJob(ctx context.Context, id int64, attempt int, note stri
1075
1078
func (s *Store) CancelInterruptible(ctx context.Context, repoID int64, ref string, keep int64) (running []int64, pipes []int64, err error) {
1076
1079
rows, err := s.db.QueryContext(ctx, `SELECT j.id, j.pipeline_id, j.status FROM jobs j
1077
1080
JOIN pipelines p ON p.id = j.pipeline_id
1078
WHERE p.repo_id = ? AND p.ref = ? AND p.id != ? AND j.interruptible = 1 AND j.status IN ('queued', 'running', 'manual')`, repoID, ref, keep)
1081
WHERE p.repo_id = ? AND p.ref = ? AND p.id != ? AND j.interruptible = 1 AND j.status IN ('queued', 'running', 'manual')
1082
AND NOT (j.status = 'running' AND j.do_not_interrupt = 1)`, repoID, ref, keep)
1079
1083
if err != nil {
1080
1084
return nil, nil, err
1081
1085
}
@@ -1546,3 +1550,58 @@ func PipelineObsolete(jobs []Job) bool {
1546
1550
}
1547
1551
return seen
1548
1552
}
1553
1554
// ProtectedBlocker zoekt een lopende doNotInterrupt-job in een oudere
1555
// pipeline op dezelfde ref. Zolang die er is, wacht pipeline pipelineID.
1556
func (s *Store) ProtectedBlocker(ctx context.Context, repoID int64, ref string, pipelineID int64) (Job, bool) {
1557
rows, err := s.db.QueryContext(ctx, jobSelect+` WHERE p.repo_id = ? AND p.ref = ? AND p.id < ? AND j.status = 'running' AND j.do_not_interrupt = 1 ORDER BY j.id LIMIT 1`, repoID, ref, pipelineID)
1558
if err != nil {
1559
return Job{}, false
1560
}
1561
defer rows.Close()
1562
if !rows.Next() {
1563
return Job{}, false
1564
}
1565
j, err := scanJob(rows)
1566
return j, err == nil
1567
}
1568
1569
// RunningProtectedJobs geeft lopende doNotInterrupt-jobs. Met repoID > 0
1570
// alleen in die repo; met runnerID > 0 alleen op die aparte runner.
1571
func (s *Store) RunningProtectedJobs(ctx context.Context, repoID, runnerID int64) ([]Job, error) {
1572
q := jobSelect + ` WHERE j.status = 'running' AND j.do_not_interrupt = 1`
1573
var args []any
1574
if repoID > 0 {
1575
q += ` AND j.repo_id = ?`
1576
args = append(args, repoID)
1577
}
1578
if runnerID > 0 {
1579
q += ` AND j.id IN (SELECT job_id FROM job_runs WHERE runner_id = ?)`
1580
args = append(args, runnerID)
1581
}
1582
rows, err := s.db.QueryContext(ctx, q+` ORDER BY j.id`, args...)
1583
if err != nil {
1584
return nil, err
1585
}
1586
defer rows.Close()
1587
var out []Job
1588
for rows.Next() {
1589
j, err := scanJob(rows)
1590
if err != nil {
1591
return nil, err
1592
}
1593
out = append(out, j)
1594
}
1595
return out, rows.Err()
1596
}
1597
1598
// ProtectedRunning filtert de lopende doNotInterrupt-jobs uit jobs.
1599
func ProtectedRunning(jobs []Job) []Job {
1600
var out []Job
1601
for _, j := range jobs {
1602
if j.Status == "running" && j.DoNotInterrupt {
1603
out = append(out, j)
1604
}
1605
}
1606
return out
1607
}
@@ -375,6 +375,7 @@ type NewJob struct {375
Environment string375
Environment string376
EnvironmentURL string376
EnvironmentURL string377
Interruptible bool377
Interruptible bool378
DoNotInterrupt bool378
}379
}379
380
380
// Service is een sidecar die de runner naast de job start.381
// Service is een sidecar die de runner naast de job start.@@ -439,6 +440,7 @@ type Job struct {439
Environment string440
Environment string440
EnvironmentURL string441
EnvironmentURL string441
Interruptible bool442
Interruptible bool443
DoNotInterrupt bool442
// Reason zegt waarom een job failed of canceled is: job_execution_timeout,444
// Reason zegt waarom een job failed of canceled is: job_execution_timeout,443
// script_failure, runner_system_failure, canceled_by_user,445
// script_failure, runner_system_failure, canceled_by_user,444
// canceled_by_newer_pipeline. Leeg bij succes of onbekend (oude jobs).446
// canceled_by_newer_pipeline. Leeg bij succes of onbekend (oude jobs).@@ -791,11 +793,11 @@ func insertPipelineJobs(ctx context.Context, tx *sql.Tx, id, repoID int64, jobs791
if j.When == "manual" {793
if j.When == "manual" {792
status = "manual"794
status = "manual"793
}795
}794
_, err := tx.ExecContext(ctx, `INSERT INTO jobs (pipeline_id, repo_id, name, stage, position, status, image, script, needs_json, needs_set, variables_json, artifact_paths, artifact_expire_seconds, allow_failure, log, before_script, after_script, when_mode, timeout_seconds, tags_json, cache_paths, cache_key, resource_group, optional_json, retry_max, retry_when, services_json, environment_name, environment_url, interruptible)796
_, err := tx.ExecContext(ctx, `INSERT INTO jobs (pipeline_id, repo_id, name, stage, position, status, image, script, needs_json, needs_set, variables_json, artifact_paths, artifact_expire_seconds, allow_failure, log, before_script, after_script, when_mode, timeout_seconds, tags_json, cache_paths, cache_key, resource_group, optional_json, retry_max, retry_when, services_json, environment_name, environment_url, interruptible, do_not_interrupt)795
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,797
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, '', ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,796
id, repoID, j.Name, j.Stage, j.Position, status, j.Image, j.Script, mustJSON(j.Needs), boolInt(j.NeedsSet), mustJSON(j.Variables), mustJSON(j.ArtifactPaths), int(j.ArtifactExpire/time.Second), boolInt(j.AllowFailure),798
id, repoID, j.Name, j.Stage, j.Position, status, j.Image, j.Script, mustJSON(j.Needs), boolInt(j.NeedsSet), mustJSON(j.Variables), mustJSON(j.ArtifactPaths), int(j.ArtifactExpire/time.Second), boolInt(j.AllowFailure),797
j.Before, j.After, j.When, int(j.Timeout/time.Second), mustJSON(j.Tags), mustJSON(j.CachePaths), j.CacheKey, j.ResourceGroup, mustJSON(j.Optional),799
j.Before, j.After, j.When, int(j.Timeout/time.Second), mustJSON(j.Tags), mustJSON(j.CachePaths), j.CacheKey, j.ResourceGroup, mustJSON(j.Optional),798
j.RetryMax, mustJSON(j.RetryWhen), mustJSON(j.Services), j.Environment, j.EnvironmentURL, boolInt(j.Interruptible))800
j.RetryMax, mustJSON(j.RetryWhen), mustJSON(j.Services), j.Environment, j.EnvironmentURL, boolInt(j.Interruptible), boolInt(j.DoNotInterrupt))799
if err != nil {801
if err != nil {800
return err802
return err801
}803
}@@ -925,20 +927,21 @@ func (s *Store) JobsByPipeline(ctx context.Context, pipelineID int64) ([]Job, er925
return out, rows.Err()927
return out, rows.Err()926
}928
}927
929
928
const jobSelect = `SELECT j.id, j.pipeline_id, j.repo_id, j.name, j.stage, j.position, j.status, j.image, j.script, j.needs_json, j.needs_set, j.variables_json, j.artifact_paths, j.artifact_expire_seconds, j.allow_failure, j.log, p.commit_sha, p.ref, j.before_script, j.after_script, j.when_mode, j.timeout_seconds, j.tags_json, j.cache_paths, j.cache_key, j.resource_group, j.optional_json, j.started_at, j.finished_at, j.retry_max, j.retry_when, j.attempt, j.services_json, j.environment_name, j.environment_url, j.interruptible, j.failure_reason930
const jobSelect = `SELECT j.id, j.pipeline_id, j.repo_id, j.name, j.stage, j.position, j.status, j.image, j.script, j.needs_json, j.needs_set, j.variables_json, j.artifact_paths, j.artifact_expire_seconds, j.allow_failure, j.log, p.commit_sha, p.ref, j.before_script, j.after_script, j.when_mode, j.timeout_seconds, j.tags_json, j.cache_paths, j.cache_key, j.resource_group, j.optional_json, j.started_at, j.finished_at, j.retry_max, j.retry_when, j.attempt, j.services_json, j.environment_name, j.environment_url, j.interruptible, j.failure_reason, j.do_not_interrupt929
FROM jobs j JOIN pipelines p ON p.id = j.pipeline_id`931
FROM jobs j JOIN pipelines p ON p.id = j.pipeline_id`930
932
931
func scanJob(rows *sql.Rows) (Job, error) {933
func scanJob(rows *sql.Rows) (Job, error) {932
var j Job934
var j Job933
var needs, vars, paths, tags, cache, optional, retryWhen, services string935
var needs, vars, paths, tags, cache, optional, retryWhen, services string934
var needsSet, allow, expire, timeout, interruptible int936
var needsSet, allow, expire, timeout, interruptible, dni int935
var started, finished sql.NullString937
var started, finished sql.NullString936
if err := rows.Scan(&j.ID, &j.PipelineID, &j.RepoID, &j.Name, &j.Stage, &j.Position, &j.Status, &j.Image, &j.Script, &needs, &needsSet, &vars, &paths, &expire, &allow, &j.Log, &j.CommitSHA, &j.Ref, &j.Before, &j.After, &j.When, &timeout, &tags, &cache, &j.CacheKey, &j.ResourceGroup, &optional, &started, &finished, &j.RetryMax, &retryWhen, &j.Attempt, &services, &j.Environment, &j.EnvironmentURL, &interruptible, &j.Reason); err != nil {938
if err := rows.Scan(&j.ID, &j.PipelineID, &j.RepoID, &j.Name, &j.Stage, &j.Position, &j.Status, &j.Image, &j.Script, &needs, &needsSet, &vars, &paths, &expire, &allow, &j.Log, &j.CommitSHA, &j.Ref, &j.Before, &j.After, &j.When, &timeout, &tags, &cache, &j.CacheKey, &j.ResourceGroup, &optional, &started, &finished, &j.RetryMax, &retryWhen, &j.Attempt, &services, &j.Environment, &j.EnvironmentURL, &interruptible, &j.Reason, &dni); err != nil {937
return Job{}, err939
return Job{}, err938
}940
}939
j.NeedsSet = needsSet == 1941
j.NeedsSet = needsSet == 1940
j.AllowFailure = allow == 1942
j.AllowFailure = allow == 1941
j.Interruptible = interruptible == 1943
j.Interruptible = interruptible == 1944
j.DoNotInterrupt = dni == 1942
j.ArtifactExpire = time.Duration(expire) * time.Second945
j.ArtifactExpire = time.Duration(expire) * time.Second943
j.Timeout = time.Duration(timeout) * time.Second946
j.Timeout = time.Duration(timeout) * time.Second944
j.StartedAt = parseTime(started.String)947
j.StartedAt = parseTime(started.String)@@ -1075,7 +1078,8 @@ func (s *Store) RequeueJob(ctx context.Context, id int64, attempt int, note stri1075
func (s *Store) CancelInterruptible(ctx context.Context, repoID int64, ref string, keep int64) (running []int64, pipes []int64, err error) {1078
func (s *Store) CancelInterruptible(ctx context.Context, repoID int64, ref string, keep int64) (running []int64, pipes []int64, err error) {1076
rows, err := s.db.QueryContext(ctx, `SELECT j.id, j.pipeline_id, j.status FROM jobs j1079
rows, err := s.db.QueryContext(ctx, `SELECT j.id, j.pipeline_id, j.status FROM jobs j1077
JOIN pipelines p ON p.id = j.pipeline_id1080
JOIN pipelines p ON p.id = j.pipeline_id1078
WHERE p.repo_id = ? AND p.ref = ? AND p.id != ? AND j.interruptible = 1 AND j.status IN ('queued', 'running', 'manual')`, repoID, ref, keep)1081
WHERE p.repo_id = ? AND p.ref = ? AND p.id != ? AND j.interruptible = 1 AND j.status IN ('queued', 'running', 'manual')1082
AND NOT (j.status = 'running' AND j.do_not_interrupt = 1)`, repoID, ref, keep)1079
if err != nil {1083
if err != nil {1080
return nil, nil, err1084
return nil, nil, err1081
}1085
}@@ -1546,3 +1550,58 @@ func PipelineObsolete(jobs []Job) bool {1546
}1550
}1547
return seen1551
return seen1548
}1552
}1553
1554
// ProtectedBlocker zoekt een lopende doNotInterrupt-job in een oudere1555
// pipeline op dezelfde ref. Zolang die er is, wacht pipeline pipelineID.1556
func (s *Store) ProtectedBlocker(ctx context.Context, repoID int64, ref string, pipelineID int64) (Job, bool) {1557
rows, err := s.db.QueryContext(ctx, jobSelect+` WHERE p.repo_id = ? AND p.ref = ? AND p.id < ? AND j.status = 'running' AND j.do_not_interrupt = 1 ORDER BY j.id LIMIT 1`, repoID, ref, pipelineID)1558
if err != nil {1559
return Job{}, false1560
}1561
defer rows.Close()1562
if !rows.Next() {1563
return Job{}, false1564
}1565
j, err := scanJob(rows)1566
return j, err == nil1567
}1568
1569
// RunningProtectedJobs geeft lopende doNotInterrupt-jobs. Met repoID > 01570
// alleen in die repo; met runnerID > 0 alleen op die aparte runner.1571
func (s *Store) RunningProtectedJobs(ctx context.Context, repoID, runnerID int64) ([]Job, error) {1572
q := jobSelect + ` WHERE j.status = 'running' AND j.do_not_interrupt = 1`1573
var args []any1574
if repoID > 0 {1575
q += ` AND j.repo_id = ?`1576
args = append(args, repoID)1577
}1578
if runnerID > 0 {1579
q += ` AND j.id IN (SELECT job_id FROM job_runs WHERE runner_id = ?)`1580
args = append(args, runnerID)1581
}1582
rows, err := s.db.QueryContext(ctx, q+` ORDER BY j.id`, args...)1583
if err != nil {1584
return nil, err1585
}1586
defer rows.Close()1587
var out []Job1588
for rows.Next() {1589
j, err := scanJob(rows)1590
if err != nil {1591
return nil, err1592
}1593
out = append(out, j)1594
}1595
return out, rows.Err()1596
}1597
1598
// ProtectedRunning filtert de lopende doNotInterrupt-jobs uit jobs.1599
func ProtectedRunning(jobs []Job) []Job {1600
var out []Job1601
for _, j := range jobs {1602
if j.Status == "running" && j.DoNotInterrupt {1603
out = append(out, j)1604
}1605
}1606
return out1607
}@@ -67,3 +67,38 @@ func TestJobReasons(t *testing.T) {
67
67
t.Fatal("reden blijft staan na requeue")
68
68
}
69
69
}
70
71
func TestProtectedBlocker(t *testing.T) {
72
s := openTest(t)
73
ctx := context.Background()
74
tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)
75
repo, _ := s.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")
76
ref := "refs/heads/master"
77
a, _ := s.CreatePipeline(ctx, repo.ID, "a", ref, "push", "tim", "a", []NewJob{{Name: "up", Stage: "d", Script: "true", DoNotInterrupt: true}})
78
b, _ := s.CreatePipeline(ctx, repo.ID, "b", ref, "push", "tim", "b", []NewJob{{Name: "up", Stage: "d", Script: "true", DoNotInterrupt: true}})
79
other, _ := s.CreatePipeline(ctx, repo.ID, "c", "refs/heads/feature", "push", "tim", "c", []NewJob{{Name: "x", Stage: "d", Script: "true"}})
80
if _, ok := s.ProtectedBlocker(ctx, repo.ID, ref, b); ok {
81
t.Fatal("wachtende dni-job blokkeert niet")
82
}
83
ja, _ := s.JobsByPipeline(ctx, a)
84
if !ja[0].DoNotInterrupt {
85
t.Fatal("vlag niet bewaard")
86
}
87
_, _ = s.MarkJobRunning(ctx, ja[0].ID)
88
if j, ok := s.ProtectedBlocker(ctx, repo.ID, ref, b); !ok || j.ID != ja[0].ID {
89
t.Fatal("nieuwere pipeline hoort te wachten")
90
}
91
if _, ok := s.ProtectedBlocker(ctx, repo.ID, ref, a); ok {
92
t.Fatal("geen wachten op jezelf of nieuwere pipelines")
93
}
94
if _, ok := s.ProtectedBlocker(ctx, repo.ID, "refs/heads/feature", other); ok {
95
t.Fatal("andere ref wacht niet")
96
}
97
if prot, _ := s.RunningProtectedJobs(ctx, repo.ID, 0); len(prot) != 1 {
98
t.Fatalf("lopend: %d", len(prot))
99
}
100
_ = s.FinishJobReason(ctx, ja[0].ID, "failed", "", "job_execution_timeout")
101
if _, ok := s.ProtectedBlocker(ctx, repo.ID, ref, b); ok {
102
t.Fatal("na een timeout gaat het wachten door")
103
}
104
}
@@ -67,3 +67,38 @@ func TestJobReasons(t *testing.T) {67
t.Fatal("reden blijft staan na requeue")67
t.Fatal("reden blijft staan na requeue")68
}68
}69
}69
}70
71
func TestProtectedBlocker(t *testing.T) {72
s := openTest(t)73
ctx := context.Background()74
tim, _ := s.UpsertUser(ctx, 1, "tim", "", false)75
repo, _ := s.CreateRepo(ctx, "user", tim.ID, "ci", "", "master", "private")76
ref := "refs/heads/master"77
a, _ := s.CreatePipeline(ctx, repo.ID, "a", ref, "push", "tim", "a", []NewJob{{Name: "up", Stage: "d", Script: "true", DoNotInterrupt: true}})78
b, _ := s.CreatePipeline(ctx, repo.ID, "b", ref, "push", "tim", "b", []NewJob{{Name: "up", Stage: "d", Script: "true", DoNotInterrupt: true}})79
other, _ := s.CreatePipeline(ctx, repo.ID, "c", "refs/heads/feature", "push", "tim", "c", []NewJob{{Name: "x", Stage: "d", Script: "true"}})80
if _, ok := s.ProtectedBlocker(ctx, repo.ID, ref, b); ok {81
t.Fatal("wachtende dni-job blokkeert niet")82
}83
ja, _ := s.JobsByPipeline(ctx, a)84
if !ja[0].DoNotInterrupt {85
t.Fatal("vlag niet bewaard")86
}87
_, _ = s.MarkJobRunning(ctx, ja[0].ID)88
if j, ok := s.ProtectedBlocker(ctx, repo.ID, ref, b); !ok || j.ID != ja[0].ID {89
t.Fatal("nieuwere pipeline hoort te wachten")90
}91
if _, ok := s.ProtectedBlocker(ctx, repo.ID, ref, a); ok {92
t.Fatal("geen wachten op jezelf of nieuwere pipelines")93
}94
if _, ok := s.ProtectedBlocker(ctx, repo.ID, "refs/heads/feature", other); ok {95
t.Fatal("andere ref wacht niet")96
}97
if prot, _ := s.RunningProtectedJobs(ctx, repo.ID, 0); len(prot) != 1 {98
t.Fatalf("lopend: %d", len(prot))99
}100
_ = s.FinishJobReason(ctx, ja[0].ID, "failed", "", "job_execution_timeout")101
if _, ok := s.ProtectedBlocker(ctx, repo.ID, ref, b); ok {102
t.Fatal("na een timeout gaat het wachten door")103
}104
}@@ -79,7 +79,7 @@ func jobsToNew(jobs []Job) []NewJob {
79
79
Tags: j.Tags, CachePaths: j.CachePaths, CacheKey: j.CacheKey,
80
80
ResourceGroup: j.ResourceGroup, RetryMax: j.RetryMax, RetryWhen: j.RetryWhen,
81
81
Services: j.Services, Environment: j.Environment, EnvironmentURL: j.EnvironmentURL,
82
Interruptible: j.Interruptible,
82
Interruptible: j.Interruptible, DoNotInterrupt: j.DoNotInterrupt,
83
83
}
84
84
}
85
85
return out
@@ -79,7 +79,7 @@ func jobsToNew(jobs []Job) []NewJob {79
Tags: j.Tags, CachePaths: j.CachePaths, CacheKey: j.CacheKey,79
Tags: j.Tags, CachePaths: j.CachePaths, CacheKey: j.CacheKey,80
ResourceGroup: j.ResourceGroup, RetryMax: j.RetryMax, RetryWhen: j.RetryWhen,80
ResourceGroup: j.ResourceGroup, RetryMax: j.RetryMax, RetryWhen: j.RetryWhen,81
Services: j.Services, Environment: j.Environment, EnvironmentURL: j.EnvironmentURL,81
Services: j.Services, Environment: j.Environment, EnvironmentURL: j.EnvironmentURL,82
Interruptible: j.Interruptible,82
Interruptible: j.Interruptible, DoNotInterrupt: j.DoNotInterrupt,83
}83
}84
}84
}85
return out85
return out@@ -94,6 +94,7 @@ func (s *Store) migrate() error {
94
94
`ALTER TABLE jobs ADD COLUMN environment_name TEXT NOT NULL DEFAULT ''`,
95
95
`ALTER TABLE jobs ADD COLUMN environment_url TEXT NOT NULL DEFAULT ''`,
96
96
`ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,
97
`ALTER TABLE jobs ADD COLUMN do_not_interrupt INTEGER NOT NULL DEFAULT 0`,
97
98
`ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,
98
99
`ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,
99
100
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,
@@ -356,6 +357,7 @@ CREATE TABLE IF NOT EXISTS jobs (
356
357
environment_name TEXT NOT NULL DEFAULT '',
357
358
environment_url TEXT NOT NULL DEFAULT '',
358
359
interruptible INTEGER NOT NULL DEFAULT 0,
360
do_not_interrupt INTEGER NOT NULL DEFAULT 0,
359
361
UNIQUE(pipeline_id, name)
360
362
);
361
363
CREATE TABLE IF NOT EXISTS artifacts (
@@ -94,6 +94,7 @@ func (s *Store) migrate() error {94
`ALTER TABLE jobs ADD COLUMN environment_name TEXT NOT NULL DEFAULT ''`,94
`ALTER TABLE jobs ADD COLUMN environment_name TEXT NOT NULL DEFAULT ''`,95
`ALTER TABLE jobs ADD COLUMN environment_url TEXT NOT NULL DEFAULT ''`,95
`ALTER TABLE jobs ADD COLUMN environment_url TEXT NOT NULL DEFAULT ''`,96
`ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,96
`ALTER TABLE jobs ADD COLUMN interruptible INTEGER NOT NULL DEFAULT 0`,97
`ALTER TABLE jobs ADD COLUMN do_not_interrupt INTEGER NOT NULL DEFAULT 0`,97
`ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,98
`ALTER TABLE pipelines ADD COLUMN mr_id INTEGER NOT NULL DEFAULT 0`,98
`ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,99
`ALTER TABLE groups ADD COLUMN owner_id INTEGER NOT NULL DEFAULT 0`,99
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,100
`ALTER TABLE merge_requests ADD COLUMN draft INTEGER NOT NULL DEFAULT 0`,@@ -356,6 +357,7 @@ CREATE TABLE IF NOT EXISTS jobs (356
environment_name TEXT NOT NULL DEFAULT '',357
environment_name TEXT NOT NULL DEFAULT '',357
environment_url TEXT NOT NULL DEFAULT '',358
environment_url TEXT NOT NULL DEFAULT '',358
interruptible INTEGER NOT NULL DEFAULT 0,359
interruptible INTEGER NOT NULL DEFAULT 0,360
do_not_interrupt INTEGER NOT NULL DEFAULT 0,359
UNIQUE(pipeline_id, name)361
UNIQUE(pipeline_id, name)360
);362
);361
CREATE TABLE IF NOT EXISTS artifacts (363
CREATE TABLE IF NOT EXISTS artifacts (@@ -4,6 +4,8 @@ After=network-online.target docker.service
4
4
Wants=network-online.target
5
5
6
6
[Service]
7
# doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).
8
TimeoutStopSec=49h
7
9
Type=simple
8
10
User=bluegit
9
11
Group=bluegit
@@ -4,6 +4,8 @@ After=network-online.target docker.service4
Wants=network-online.target4
Wants=network-online.target5
5
6
[Service]6
[Service]7
# doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).8
TimeoutStopSec=49h7
Type=simple9
Type=simple8
User=bluegit10
User=bluegit9
Group=bluegit11
Group=bluegit@@ -7,6 +7,8 @@ Wants=network-online.target
7
7
ConditionPathExists=/etc/bluegit-runner/config.yml
8
8
9
9
[Service]
10
# doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).
11
TimeoutStopSec=49h
10
12
Type=simple
11
13
User=bluegit-runner
12
14
Group=bluegit-runner
@@ -7,6 +7,8 @@ Wants=network-online.target7
ConditionPathExists=/etc/bluegit-runner/config.yml7
ConditionPathExists=/etc/bluegit-runner/config.yml8
8
9
[Service]9
[Service]10
# doNotInterrupt-jobs lopen bij stoppen uit (hun eigen timeout begrenst dat).11
TimeoutStopSec=49h10
Type=simple12
Type=simple11
User=bluegit-runner13
User=bluegit-runner12
Group=bluegit-runner14
Group=bluegit-runner@@ -110,8 +110,15 @@ cmd_pipeline() {
110
110
local mode=failed
111
111
[[ ${3:-} == --all ]] && mode=all
112
112
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/retry" "$(json --arg m "$mode" '{mode:$m}')" | jq -r '"pipeline #\(.id) \(.status) \(.web_url)"' ;;
113
cancel)
114
# Een lopende doNotInterrupt-job vraagt om --force; zonder geeft de API 409 met uitleg.
115
local f=""; [[ ${3:-} == --force ]] && f="?force=true"
116
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/cancel$f" '{}' | jq -r '"pipeline #\(.id) \(.display_status // .status) \(.web_url)"' ;;
117
cancel-job)
118
local f=""; [[ ${4:-} == --force ]] && f="?force=true"
119
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/jobs/${3:?job-id}/cancel$f" '{}' | jq -r '"job #\(.id) \(.name) \(.display_status // .status)"' ;;
113
120
list) get "$(proj "${1:?project}")/pipelines?per_page=${2:-10}" | jq -r '.[]|"\(.id)\t\(.display_status // .status)\t\(.ref|sub("^refs/heads/";""))\t\(.sha[0:8])"' ;;
114
*) die "pipeline status|wait|logs|retry|list" ;;
121
*) die "pipeline status|wait|logs|retry|list|cancel|cancel-job" ;;
115
122
esac
116
123
}
117
124
@@ -292,6 +299,8 @@ usage() {
292
299
bg pipeline logs PROJECT PIPELINE JOB
293
300
bg pipeline retry PROJECT PIPELINE [--all]
294
301
bg pipeline list PROJECT [N]
302
bg pipeline cancel PROJECT PIPELINE [--force] --force nodig bij een lopende doNotInterrupt-job
303
bg pipeline cancel-job PROJECT PIPELINE JOB [--force]
295
304
bg mr list|show|create|merge|comment ...
296
305
bg issue list|show|create|comment|close|reopen ...
297
306
bg branch create PROJECT NAAM [--from REF]
@@ -110,8 +110,15 @@ cmd_pipeline() {110
local mode=failed110
local mode=failed111
[[ ${3:-} == --all ]] && mode=all111
[[ ${3:-} == --all ]] && mode=all112
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/retry" "$(json --arg m "$mode" '{mode:$m}')" | jq -r '"pipeline #\(.id) \(.status) \(.web_url)"' ;;112
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/retry" "$(json --arg m "$mode" '{mode:$m}')" | jq -r '"pipeline #\(.id) \(.status) \(.web_url)"' ;;113
cancel)114
# Een lopende doNotInterrupt-job vraagt om --force; zonder geeft de API 409 met uitleg.115
local f=""; [[ ${3:-} == --force ]] && f="?force=true"116
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/cancel$f" '{}' | jq -r '"pipeline #\(.id) \(.display_status // .status) \(.web_url)"' ;;117
cancel-job)118
local f=""; [[ ${4:-} == --force ]] && f="?force=true"119
req POST "$(proj "${1:?project}")/pipelines/${2:?pipeline-id}/jobs/${3:?job-id}/cancel$f" '{}' | jq -r '"job #\(.id) \(.name) \(.display_status // .status)"' ;;113
list) get "$(proj "${1:?project}")/pipelines?per_page=${2:-10}" | jq -r '.[]|"\(.id)\t\(.display_status // .status)\t\(.ref|sub("^refs/heads/";""))\t\(.sha[0:8])"' ;;120
list) get "$(proj "${1:?project}")/pipelines?per_page=${2:-10}" | jq -r '.[]|"\(.id)\t\(.display_status // .status)\t\(.ref|sub("^refs/heads/";""))\t\(.sha[0:8])"' ;;114
*) die "pipeline status|wait|logs|retry|list" ;;121
*) die "pipeline status|wait|logs|retry|list|cancel|cancel-job" ;;115
esac122
esac116
}123
}117
124
@@ -292,6 +299,8 @@ usage() {292
bg pipeline logs PROJECT PIPELINE JOB299
bg pipeline logs PROJECT PIPELINE JOB293
bg pipeline retry PROJECT PIPELINE [--all]300
bg pipeline retry PROJECT PIPELINE [--all]294
bg pipeline list PROJECT [N]301
bg pipeline list PROJECT [N]302
bg pipeline cancel PROJECT PIPELINE [--force] --force nodig bij een lopende doNotInterrupt-job303
bg pipeline cancel-job PROJECT PIPELINE JOB [--force]295
bg mr list|show|create|merge|comment ...304
bg mr list|show|create|merge|comment ...296
bg issue list|show|create|comment|close|reopen ...305
bg issue list|show|create|comment|close|reopen ...297
bg branch create PROJECT NAAM [--from REF]306
bg branch create PROJECT NAAM [--from REF]