BlueGit

timfa bluegit

CI: handmatige jobs verlopen als hun pipeline verouderd is (nieuwere pipeline of N dagen)

timfa Tim Falken · pushed by timfa

Authored 2026-10-30 · 2 weeks ago

Hash
8bf01d369ebdae98e0b5bc0a76a7d5958be68694
Parent
cabf3fdc
Pipeline
Passed
23 files changed +899 −12
cmd/bluegit/main.go +1 −0
@@ -131,6 +131,7 @@ func serve(args []string) error {
131 131 go srv.RunnerMaintenance(ctx)
132 132 go rn.Loop(ctx, cfg.CI.Concurrency)
133 133 }
134 go srv.StaleManualSweeper(ctx)
134 135 var sh *sshd.Server
135 136 if cfg.SSH.Enabled {
136 137 sh = &sshd.Server{
@@ -131,6 +131,7 @@ func serve(args []string) error {
131 go srv.RunnerMaintenance(ctx)
131 go srv.RunnerMaintenance(ctx)
132 go rn.Loop(ctx, cfg.CI.Concurrency)
132 go rn.Loop(ctx, cfg.CI.Concurrency)
133 }
133 }
134 go srv.StaleManualSweeper(ctx)
134 var sh *sshd.Server
135 var sh *sshd.Server
135 if cfg.SSH.Enabled {
136 if cfg.SSH.Enabled {
136 sh = &sshd.Server{
137 sh = &sshd.Server{
docs/CI.md +9 −0
@@ -186,3 +186,12 @@ deploy:
186 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 187 3. **Expliciet forceren** door een gebruiker (`force=true`, of *Toch stoppen* in het venster).
188 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.
189
190 ## Verlopen handmatige jobs
191
192 Een handmatige job (`when: manual`) die nog wacht, verloopt automatisch als zijn pipeline verouderd is:
193
194 - **Nieuwere pipeline**: zodra er een nieuwere pipeline is op dezelfde ref (en hetzelfde merge request) in dezelfde repository. Een pipeline die alleen een kapotte `blue-ci-cd.yml` meldt, telt niet mee. De handmatige job in de nieuwste pipeline blijft gewoon startbaar.
195 - **Leeftijd**: een pipeline die alleen nog op handmatige jobs wacht en ouder is dan N dagen (Beheer > Pipelines, standaard 7, 0 = uit; per project te overschrijven in de projectinstellingen, leeg = instance-instelling).
196
197 Een verlopen job krijgt status `canceled` met `cancel_reason` `superseded` of `stale`, `display_status` `obsolete` en een regel in het log. Jobs die via `needs` alleen op die handmatige job wachtten, verlopen mee. Lopende of wachtende niet-handmatige jobs blijven ongemoeid. Log en artifacts blijven staan. De pipelinestatus volgt de bestaande regels: een verlopen job zonder `allow_failure` maakt de pipeline `canceled` (getoond als obsolete), een verlopen job met `allow_failure` telt niet mee. Starten of opnieuw starten van een verlopen job geeft 409. De controle draait één minuut na de start en daarna elk uur; `POST /api/v1/admin/pipelines/expire-stale` draait hem direct.
@@ -186,3 +186,12 @@ deploy:
1862. **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.
1862. **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.
1873. **Expliciet forceren** door een gebruiker (`force=true`, of *Toch stoppen* in het venster).
1873. **Expliciet forceren** door een gebruiker (`force=true`, of *Toch stoppen* in het venster).
1884. **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.
1884. **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.
189
190## Verlopen handmatige jobs
191
192Een handmatige job (`when: manual`) die nog wacht, verloopt automatisch als zijn pipeline verouderd is:
193
194- **Nieuwere pipeline**: zodra er een nieuwere pipeline is op dezelfde ref (en hetzelfde merge request) in dezelfde repository. Een pipeline die alleen een kapotte `blue-ci-cd.yml` meldt, telt niet mee. De handmatige job in de nieuwste pipeline blijft gewoon startbaar.
195- **Leeftijd**: een pipeline die alleen nog op handmatige jobs wacht en ouder is dan N dagen (Beheer > Pipelines, standaard 7, 0 = uit; per project te overschrijven in de projectinstellingen, leeg = instance-instelling).
196
197Een verlopen job krijgt status `canceled` met `cancel_reason` `superseded` of `stale`, `display_status` `obsolete` en een regel in het log. Jobs die via `needs` alleen op die handmatige job wachtten, verlopen mee. Lopende of wachtende niet-handmatige jobs blijven ongemoeid. Log en artifacts blijven staan. De pipelinestatus volgt de bestaande regels: een verlopen job zonder `allow_failure` maakt de pipeline `canceled` (getoond als obsolete), een verlopen job met `allow_failure` telt niet mee. Starten of opnieuw starten van een verlopen job geeft 409. De controle draait één minuut na de start en daarna elk uur; `POST /api/v1/admin/pipelines/expire-stale` draait hem direct.
internal/i18n/catalog.go +1 −1
@@ -226,7 +226,7 @@ var en = map[string]string{
226 226 "pipe.skipped": "Skipped",
227 227 "pipe.canceled": "Canceled",
228 228 "pipe.obsolete": "Obsolete",
229 "pipe.obsolete.tip": "canceled because a newer pipeline started for the same ref",
229 "pipe.obsolete.tip": "canceled because a newer pipeline started for the same ref, or a manual job that expired",
230 230 "pipe.warning": "Warning",
231 231 "pipe.stage": "Stage",
232 232 "pipe.duration": "Duration",
@@ -226,7 +226,7 @@ var en = map[string]string{
226 "pipe.skipped": "Skipped",
226 "pipe.skipped": "Skipped",
227 "pipe.canceled": "Canceled",
227 "pipe.canceled": "Canceled",
228 "pipe.obsolete": "Obsolete",
228 "pipe.obsolete": "Obsolete",
229 "pipe.obsolete.tip": "canceled because a newer pipeline started for the same ref",
229 "pipe.obsolete.tip": "canceled because a newer pipeline started for the same ref, or a manual job that expired",
230 "pipe.warning": "Warning",
230 "pipe.warning": "Warning",
231 "pipe.stage": "Stage",
231 "pipe.stage": "Stage",
232 "pipe.duration": "Duration",
232 "pipe.duration": "Duration",
internal/i18n/catalog_lang.go +3 −3
@@ -233,7 +233,7 @@ var nl = map[string]string{
233 233 "pipe.skipped": "Overgeslagen",
234 234 "pipe.canceled": "Geannuleerd",
235 235 "pipe.obsolete": "Verouderd",
236 "pipe.obsolete.tip": "geannuleerd omdat er een nieuwere pipeline voor dezelfde ref startte",
236 "pipe.obsolete.tip": "geannuleerd omdat er een nieuwere pipeline voor dezelfde ref startte, of een verlopen handmatige job",
237 237 "pipe.warning": "Waarschuwing",
238 238 "pipe.stage": "Stage",
239 239 "pipe.duration": "Duur",
@@ -879,7 +879,7 @@ var de = map[string]string{
879 879 "pipe.skipped": "Übersprungen",
880 880 "pipe.canceled": "Abgebrochen",
881 881 "pipe.obsolete": "Veraltet",
882 "pipe.obsolete.tip": "abgebrochen, weil eine neuere Pipeline für dieselbe Ref gestartet wurde",
882 "pipe.obsolete.tip": "abgebrochen, weil eine neuere Pipeline für dieselbe Ref gestartet wurde, oder ein abgelaufener manueller Job",
883 883 "pipe.warning": "Warnung",
884 884 "pipe.stage": "Stage",
885 885 "pipe.duration": "Dauer",
@@ -1525,7 +1525,7 @@ var fr = map[string]string{
1525 1525 "pipe.skipped": "Ignoré",
1526 1526 "pipe.canceled": "Annulé",
1527 1527 "pipe.obsolete": "Obsolète",
1528 "pipe.obsolete.tip": "annulé car un pipeline plus récent a démarré pour la même ref",
1528 "pipe.obsolete.tip": "annulé car un pipeline plus récent a démarré pour la même ref, ou job manuel expiré",
1529 1529 "pipe.warning": "Avertissement",
1530 1530 "pipe.stage": "Stage",
1531 1531 "pipe.duration": "Durée",
@@ -233,7 +233,7 @@ var nl = map[string]string{
233 "pipe.skipped": "Overgeslagen",
233 "pipe.skipped": "Overgeslagen",
234 "pipe.canceled": "Geannuleerd",
234 "pipe.canceled": "Geannuleerd",
235 "pipe.obsolete": "Verouderd",
235 "pipe.obsolete": "Verouderd",
236 "pipe.obsolete.tip": "geannuleerd omdat er een nieuwere pipeline voor dezelfde ref startte",
236 "pipe.obsolete.tip": "geannuleerd omdat er een nieuwere pipeline voor dezelfde ref startte, of een verlopen handmatige job",
237 "pipe.warning": "Waarschuwing",
237 "pipe.warning": "Waarschuwing",
238 "pipe.stage": "Stage",
238 "pipe.stage": "Stage",
239 "pipe.duration": "Duur",
239 "pipe.duration": "Duur",
@@ -879,7 +879,7 @@ var de = map[string]string{
879 "pipe.skipped": "Übersprungen",
879 "pipe.skipped": "Übersprungen",
880 "pipe.canceled": "Abgebrochen",
880 "pipe.canceled": "Abgebrochen",
881 "pipe.obsolete": "Veraltet",
881 "pipe.obsolete": "Veraltet",
882 "pipe.obsolete.tip": "abgebrochen, weil eine neuere Pipeline für dieselbe Ref gestartet wurde",
882 "pipe.obsolete.tip": "abgebrochen, weil eine neuere Pipeline für dieselbe Ref gestartet wurde, oder ein abgelaufener manueller Job",
883 "pipe.warning": "Warnung",
883 "pipe.warning": "Warnung",
884 "pipe.stage": "Stage",
884 "pipe.stage": "Stage",
885 "pipe.duration": "Dauer",
885 "pipe.duration": "Dauer",
@@ -1525,7 +1525,7 @@ var fr = map[string]string{
1525 "pipe.skipped": "Ignoré",
1525 "pipe.skipped": "Ignoré",
1526 "pipe.canceled": "Annulé",
1526 "pipe.canceled": "Annulé",
1527 "pipe.obsolete": "Obsolète",
1527 "pipe.obsolete": "Obsolète",
1528 "pipe.obsolete.tip": "annulé car un pipeline plus récent a démarré pour la même ref",
1528 "pipe.obsolete.tip": "annulé car un pipeline plus récent a démarré pour la même ref, ou job manuel expiré",
1529 "pipe.warning": "Avertissement",
1529 "pipe.warning": "Avertissement",
1530 "pipe.stage": "Stage",
1530 "pipe.stage": "Stage",
1531 "pipe.duration": "Durée",
1531 "pipe.duration": "Durée",
internal/i18n/catalog_stale.go added +76 −0
@@ -0,0 +1,76 @@
1 package i18n
2
3 func init() {
4 addCatalog(en, map[string]string{
5 "admin.tab.pipelines": "Pipelines",
6 "err.jobExpired": "%s has expired (obsolete) and can no longer be started; run a new pipeline instead",
7 "stale.err.days": "enter a number of days from 0 to 3650 (empty in a project = use the instance setting)",
8 "stale.expired.age": "This manual job has expired: its pipeline waited only for manual action for longer than the configured number of days. Start a new pipeline to run it.",
9 "stale.expired.superseded": "This manual job has expired: a newer pipeline exists for the same ref. Start it from the newest pipeline instead.",
10 "stale.pill": "Expired",
11 "stale.pill.tip": "Manual jobs expire when their pipeline is stale. The log and artifacts stay available.",
12 "stale.modal.title": "Job expired",
13 "stale.repo.label": "Expire manual jobs after (days)",
14 "stale.repo.tip": "A pipeline that waits only for manual jobs longer than this expires; 0 = never by age. Empty = the instance setting. Manual jobs of older pipelines on the same ref always expire.",
15 "stale.repo.inherit": "instance setting (%d)",
16 "stale.admin.title": "Pipelines",
17 "stale.admin.lead": "Manual jobs expire (obsolete) as soon as a newer pipeline runs for the same ref, or when their pipeline waited only for manual action for too long. Logs and artifacts stay.",
18 "stale.admin.days": "Expire manual jobs after (days)",
19 "stale.admin.tip": "Applies to pipelines that only wait for manual jobs. 0 = off. Projects can override this in their settings.",
20 "stale.admin.hint": "Default: %d days. A check runs every hour.",
21 })
22 addCatalog(nl, map[string]string{
23 "admin.tab.pipelines": "Pipelines",
24 "err.jobExpired": "%s is verlopen (obsolete) en kan niet meer gestart worden; start een nieuwe pipeline",
25 "stale.err.days": "vul een aantal dagen in van 0 tot 3650 (leeg bij een project = instance-instelling volgen)",
26 "stale.expired.age": "Deze handmatige job is verlopen: zijn pipeline wachtte langer dan het ingestelde aantal dagen alleen nog op handmatige actie. Start een nieuwe pipeline om hem te draaien.",
27 "stale.expired.superseded": "Deze handmatige job is verlopen: er is een nieuwere pipeline voor dezelfde ref. Start hem vanuit de nieuwste pipeline.",
28 "stale.pill": "Verlopen",
29 "stale.pill.tip": "Handmatige jobs verlopen als hun pipeline verouderd is. Log en artifacts blijven beschikbaar.",
30 "stale.modal.title": "Job verlopen",
31 "stale.repo.label": "Handmatige jobs verlopen na (dagen)",
32 "stale.repo.tip": "Een pipeline die langer dan dit alleen op handmatige jobs wacht, verloopt; 0 = nooit op leeftijd. Leeg = instance-instelling. Handmatige jobs van oudere pipelines op dezelfde ref verlopen altijd.",
33 "stale.repo.inherit": "instance-instelling (%d)",
34 "stale.admin.title": "Pipelines",
35 "stale.admin.lead": "Handmatige jobs verlopen (obsolete) zodra er een nieuwere pipeline voor dezelfde ref draait, of als hun pipeline te lang alleen op handmatige actie wachtte. Logs en artifacts blijven staan.",
36 "stale.admin.days": "Handmatige jobs verlopen na (dagen)",
37 "stale.admin.tip": "Geldt voor pipelines die alleen nog op handmatige jobs wachten. 0 = uit. Projecten kunnen dit in hun instellingen overschrijven.",
38 "stale.admin.hint": "Standaard: %d dagen. Elk uur wordt gecontroleerd.",
39 })
40 addCatalog(de, map[string]string{
41 "admin.tab.pipelines": "Pipelines",
42 "err.jobExpired": "%s ist abgelaufen (obsolet) und kann nicht mehr gestartet werden; starte eine neue Pipeline",
43 "stale.err.days": "gib eine Anzahl Tage von 0 bis 3650 ein (leer im Projekt = Instanzeinstellung)",
44 "stale.expired.age": "Dieser manuelle Job ist abgelaufen: seine Pipeline wartete länger als die eingestellte Anzahl Tage nur noch auf manuelle Aktionen. Starte eine neue Pipeline, um ihn auszuführen.",
45 "stale.expired.superseded": "Dieser manuelle Job ist abgelaufen: Es gibt eine neuere Pipeline für dieselbe Ref. Starte ihn aus der neuesten Pipeline.",
46 "stale.pill": "Abgelaufen",
47 "stale.pill.tip": "Manuelle Jobs laufen ab, wenn ihre Pipeline veraltet ist. Log und Artefakte bleiben erhalten.",
48 "stale.modal.title": "Job abgelaufen",
49 "stale.repo.label": "Manuelle Jobs laufen ab nach (Tagen)",
50 "stale.repo.tip": "Eine Pipeline, die länger nur auf manuelle Jobs wartet, läuft ab; 0 = nie nach Alter. Leer = Instanzeinstellung. Manuelle Jobs älterer Pipelines derselben Ref laufen immer ab.",
51 "stale.repo.inherit": "Instanzeinstellung (%d)",
52 "stale.admin.title": "Pipelines",
53 "stale.admin.lead": "Manuelle Jobs laufen ab (obsolet), sobald eine neuere Pipeline für dieselbe Ref läuft oder ihre Pipeline zu lange nur auf manuelle Aktionen wartete. Logs und Artefakte bleiben.",
54 "stale.admin.days": "Manuelle Jobs laufen ab nach (Tagen)",
55 "stale.admin.tip": "Gilt für Pipelines, die nur noch auf manuelle Jobs warten. 0 = aus. Projekte können das in ihren Einstellungen überschreiben.",
56 "stale.admin.hint": "Standard: %d Tage. Die Prüfung läuft stündlich.",
57 })
58 addCatalog(fr, map[string]string{
59 "admin.tab.pipelines": "Pipelines",
60 "err.jobExpired": "%s a expiré (obsolète) et ne peut plus être lancé ; lancez un nouveau pipeline",
61 "stale.err.days": "saisissez un nombre de jours de 0 à 3650 (vide dans un projet = réglage de l’instance)",
62 "stale.expired.age": "Ce job manuel a expiré : son pipeline n’attendait plus qu’une action manuelle depuis plus longtemps que le nombre de jours configuré. Lancez un nouveau pipeline pour l’exécuter.",
63 "stale.expired.superseded": "Ce job manuel a expiré : un pipeline plus récent existe pour la même ref. Lancez-le depuis le pipeline le plus récent.",
64 "stale.pill": "Expiré",
65 "stale.pill.tip": "Les jobs manuels expirent quand leur pipeline est périmé. Le journal et les artefacts restent disponibles.",
66 "stale.modal.title": "Job expiré",
67 "stale.repo.label": "Expiration des jobs manuels après (jours)",
68 "stale.repo.tip": "Un pipeline qui n’attend que des jobs manuels plus longtemps expire ; 0 = jamais selon l’âge. Vide = réglage de l’instance. Les jobs manuels des pipelines plus anciens sur la même ref expirent toujours.",
69 "stale.repo.inherit": "réglage de l’instance (%d)",
70 "stale.admin.title": "Pipelines",
71 "stale.admin.lead": "Les jobs manuels expirent (obsolètes) dès qu’un pipeline plus récent tourne pour la même ref, ou quand leur pipeline n’a attendu qu’une action manuelle trop longtemps. Journaux et artefacts restent.",
72 "stale.admin.days": "Expiration des jobs manuels après (jours)",
73 "stale.admin.tip": "S’applique aux pipelines qui n’attendent plus que des jobs manuels. 0 = désactivé. Les projets peuvent le remplacer dans leurs paramètres.",
74 "stale.admin.hint": "Par défaut : %d jours. Une vérification a lieu toutes les heures.",
75 })
76 }
@@ -0,0 +1,76 @@
1package i18n
2
3func init() {
4 addCatalog(en, map[string]string{
5 "admin.tab.pipelines": "Pipelines",
6 "err.jobExpired": "%s has expired (obsolete) and can no longer be started; run a new pipeline instead",
7 "stale.err.days": "enter a number of days from 0 to 3650 (empty in a project = use the instance setting)",
8 "stale.expired.age": "This manual job has expired: its pipeline waited only for manual action for longer than the configured number of days. Start a new pipeline to run it.",
9 "stale.expired.superseded": "This manual job has expired: a newer pipeline exists for the same ref. Start it from the newest pipeline instead.",
10 "stale.pill": "Expired",
11 "stale.pill.tip": "Manual jobs expire when their pipeline is stale. The log and artifacts stay available.",
12 "stale.modal.title": "Job expired",
13 "stale.repo.label": "Expire manual jobs after (days)",
14 "stale.repo.tip": "A pipeline that waits only for manual jobs longer than this expires; 0 = never by age. Empty = the instance setting. Manual jobs of older pipelines on the same ref always expire.",
15 "stale.repo.inherit": "instance setting (%d)",
16 "stale.admin.title": "Pipelines",
17 "stale.admin.lead": "Manual jobs expire (obsolete) as soon as a newer pipeline runs for the same ref, or when their pipeline waited only for manual action for too long. Logs and artifacts stay.",
18 "stale.admin.days": "Expire manual jobs after (days)",
19 "stale.admin.tip": "Applies to pipelines that only wait for manual jobs. 0 = off. Projects can override this in their settings.",
20 "stale.admin.hint": "Default: %d days. A check runs every hour.",
21 })
22 addCatalog(nl, map[string]string{
23 "admin.tab.pipelines": "Pipelines",
24 "err.jobExpired": "%s is verlopen (obsolete) en kan niet meer gestart worden; start een nieuwe pipeline",
25 "stale.err.days": "vul een aantal dagen in van 0 tot 3650 (leeg bij een project = instance-instelling volgen)",
26 "stale.expired.age": "Deze handmatige job is verlopen: zijn pipeline wachtte langer dan het ingestelde aantal dagen alleen nog op handmatige actie. Start een nieuwe pipeline om hem te draaien.",
27 "stale.expired.superseded": "Deze handmatige job is verlopen: er is een nieuwere pipeline voor dezelfde ref. Start hem vanuit de nieuwste pipeline.",
28 "stale.pill": "Verlopen",
29 "stale.pill.tip": "Handmatige jobs verlopen als hun pipeline verouderd is. Log en artifacts blijven beschikbaar.",
30 "stale.modal.title": "Job verlopen",
31 "stale.repo.label": "Handmatige jobs verlopen na (dagen)",
32 "stale.repo.tip": "Een pipeline die langer dan dit alleen op handmatige jobs wacht, verloopt; 0 = nooit op leeftijd. Leeg = instance-instelling. Handmatige jobs van oudere pipelines op dezelfde ref verlopen altijd.",
33 "stale.repo.inherit": "instance-instelling (%d)",
34 "stale.admin.title": "Pipelines",
35 "stale.admin.lead": "Handmatige jobs verlopen (obsolete) zodra er een nieuwere pipeline voor dezelfde ref draait, of als hun pipeline te lang alleen op handmatige actie wachtte. Logs en artifacts blijven staan.",
36 "stale.admin.days": "Handmatige jobs verlopen na (dagen)",
37 "stale.admin.tip": "Geldt voor pipelines die alleen nog op handmatige jobs wachten. 0 = uit. Projecten kunnen dit in hun instellingen overschrijven.",
38 "stale.admin.hint": "Standaard: %d dagen. Elk uur wordt gecontroleerd.",
39 })
40 addCatalog(de, map[string]string{
41 "admin.tab.pipelines": "Pipelines",
42 "err.jobExpired": "%s ist abgelaufen (obsolet) und kann nicht mehr gestartet werden; starte eine neue Pipeline",
43 "stale.err.days": "gib eine Anzahl Tage von 0 bis 3650 ein (leer im Projekt = Instanzeinstellung)",
44 "stale.expired.age": "Dieser manuelle Job ist abgelaufen: seine Pipeline wartete länger als die eingestellte Anzahl Tage nur noch auf manuelle Aktionen. Starte eine neue Pipeline, um ihn auszuführen.",
45 "stale.expired.superseded": "Dieser manuelle Job ist abgelaufen: Es gibt eine neuere Pipeline für dieselbe Ref. Starte ihn aus der neuesten Pipeline.",
46 "stale.pill": "Abgelaufen",
47 "stale.pill.tip": "Manuelle Jobs laufen ab, wenn ihre Pipeline veraltet ist. Log und Artefakte bleiben erhalten.",
48 "stale.modal.title": "Job abgelaufen",
49 "stale.repo.label": "Manuelle Jobs laufen ab nach (Tagen)",
50 "stale.repo.tip": "Eine Pipeline, die länger nur auf manuelle Jobs wartet, läuft ab; 0 = nie nach Alter. Leer = Instanzeinstellung. Manuelle Jobs älterer Pipelines derselben Ref laufen immer ab.",
51 "stale.repo.inherit": "Instanzeinstellung (%d)",
52 "stale.admin.title": "Pipelines",
53 "stale.admin.lead": "Manuelle Jobs laufen ab (obsolet), sobald eine neuere Pipeline für dieselbe Ref läuft oder ihre Pipeline zu lange nur auf manuelle Aktionen wartete. Logs und Artefakte bleiben.",
54 "stale.admin.days": "Manuelle Jobs laufen ab nach (Tagen)",
55 "stale.admin.tip": "Gilt für Pipelines, die nur noch auf manuelle Jobs warten. 0 = aus. Projekte können das in ihren Einstellungen überschreiben.",
56 "stale.admin.hint": "Standard: %d Tage. Die Prüfung läuft stündlich.",
57 })
58 addCatalog(fr, map[string]string{
59 "admin.tab.pipelines": "Pipelines",
60 "err.jobExpired": "%s a expiré (obsolète) et ne peut plus être lancé ; lancez un nouveau pipeline",
61 "stale.err.days": "saisissez un nombre de jours de 0 à 3650 (vide dans un projet = réglage de l’instance)",
62 "stale.expired.age": "Ce job manuel a expiré : son pipeline n’attendait plus qu’une action manuelle depuis plus longtemps que le nombre de jours configuré. Lancez un nouveau pipeline pour l’exécuter.",
63 "stale.expired.superseded": "Ce job manuel a expiré : un pipeline plus récent existe pour la même ref. Lancez-le depuis le pipeline le plus récent.",
64 "stale.pill": "Expiré",
65 "stale.pill.tip": "Les jobs manuels expirent quand leur pipeline est périmé. Le journal et les artefacts restent disponibles.",
66 "stale.modal.title": "Job expiré",
67 "stale.repo.label": "Expiration des jobs manuels après (jours)",
68 "stale.repo.tip": "Un pipeline qui n’attend que des jobs manuels plus longtemps expire ; 0 = jamais selon l’âge. Vide = réglage de l’instance. Les jobs manuels des pipelines plus anciens sur la même ref expirent toujours.",
69 "stale.repo.inherit": "réglage de l’instance (%d)",
70 "stale.admin.title": "Pipelines",
71 "stale.admin.lead": "Les jobs manuels expirent (obsolètes) dès qu’un pipeline plus récent tourne pour la même ref, ou quand leur pipeline n’a attendu qu’une action manuelle trop longtemps. Journaux et artefacts restent.",
72 "stale.admin.days": "Expiration des jobs manuels après (jours)",
73 "stale.admin.tip": "S’applique aux pipelines qui n’attendent plus que des jobs manuels. 0 = désactivé. Les projets peuvent le remplacer dans leurs paramètres.",
74 "stale.admin.hint": "Par défaut : %d jours. Une vérification a lieu toutes les heures.",
75 })
76}
internal/server/admin_users.go +5 −2
@@ -26,15 +26,16 @@ func adminTabs(page string) []AdminTab {
26 26 {Key: "admin.tab.users", Href: "/admin/users"},
27 27 {Key: "admin.tab.runner", Href: "/admin/runner"},
28 28 {Key: "admin.tab.storage", Href: "/setup"},
29 {Key: "admin.tab.pipelines", Href: "/admin/pipelines"},
29 30 }
30 31 for i := range tabs {
31 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2)
32 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3)
32 33 }
33 34 return tabs
34 35 }
35 36
36 37 func isAdminPage(page string) bool {
37 return page == "adminusers" || page == "adminrunner" || page == "setup"
38 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines"
38 39 }
39 40
40 41 func (s *Server) mountAdmin(mux *http.ServeMux) {
@@ -42,6 +43,8 @@ func (s *Server) mountAdmin(mux *http.ServeMux) {
42 43 mux.HandleFunc("GET /admin/{$}", s.adminHome)
43 44 mux.HandleFunc("GET /admin/users", s.adminUsers)
44 45 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
46 mux.HandleFunc("GET /admin/pipelines", s.adminPipelines)
47 mux.HandleFunc("POST /admin/pipelines", s.adminPipelinesSave)
45 48 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
46 49 if ok, _ := s.adminOnly(w, r); ok {
47 50 http.Redirect(w, r, "/setup", http.StatusFound)
@@ -26,15 +26,16 @@ func adminTabs(page string) []AdminTab {
26 {Key: "admin.tab.users", Href: "/admin/users"},
26 {Key: "admin.tab.users", Href: "/admin/users"},
27 {Key: "admin.tab.runner", Href: "/admin/runner"},
27 {Key: "admin.tab.runner", Href: "/admin/runner"},
28 {Key: "admin.tab.storage", Href: "/setup"},
28 {Key: "admin.tab.storage", Href: "/setup"},
29 {Key: "admin.tab.pipelines", Href: "/admin/pipelines"},
29 }
30 }
30 for i := range tabs {
31 for i := range tabs {
31 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2)
32 tabs[i].On = (page == "adminusers" && i == 0) || (page == "adminrunner" && i == 1) || (page == "setup" && i == 2) || (page == "adminpipelines" && i == 3)
32 }
33 }
33 return tabs
34 return tabs
34}
35}
35
36
36func isAdminPage(page string) bool {
37func isAdminPage(page string) bool {
37 return page == "adminusers" || page == "adminrunner" || page == "setup"
38 return page == "adminusers" || page == "adminrunner" || page == "setup" || page == "adminpipelines"
38}
39}
39
40
40func (s *Server) mountAdmin(mux *http.ServeMux) {
41func (s *Server) mountAdmin(mux *http.ServeMux) {
@@ -42,6 +43,8 @@ func (s *Server) mountAdmin(mux *http.ServeMux) {
42 mux.HandleFunc("GET /admin/{$}", s.adminHome)
43 mux.HandleFunc("GET /admin/{$}", s.adminHome)
43 mux.HandleFunc("GET /admin/users", s.adminUsers)
44 mux.HandleFunc("GET /admin/users", s.adminUsers)
44 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
45 mux.HandleFunc("POST /admin/users/role", s.adminUserRole)
46 mux.HandleFunc("GET /admin/pipelines", s.adminPipelines)
47 mux.HandleFunc("POST /admin/pipelines", s.adminPipelinesSave)
45 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
48 mux.HandleFunc("GET /admin/storage", func(w http.ResponseWriter, r *http.Request) {
46 if ok, _ := s.adminOnly(w, r); ok {
49 if ok, _ := s.adminOnly(w, r); ok {
47 http.Redirect(w, r, "/setup", http.StatusFound)
50 http.Redirect(w, r, "/setup", http.StatusFound)
internal/server/api_collab.go +22 −2
@@ -242,7 +242,7 @@ func (s *Server) apiGetProject(w http.ResponseWriter, r *http.Request) {
242 242 if !ok {
243 243 return
244 244 }
245 writeJSON(w, http.StatusOK, projectJSON(repo))
245 writeJSON(w, http.StatusOK, s.projectJSONFull(r, repo))
246 246 }
247 247
248 248 func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
@@ -254,6 +254,7 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
254 254 Description *string `json:"description"`
255 255 Visibility *string `json:"visibility"`
256 256 ReleaseVisibility *string `json:"release_visibility"`
257 StaleManualDays *int `json:"stale_manual_days"`
257 258 }
258 259 if err := readJSON(r, &body); err != nil {
259 260 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -271,6 +272,10 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
271 272 s.writeAPIErr(w, r, fail(400, i18n.E("err.releaseVisibility")))
272 273 return
273 274 }
275 if body.StaleManualDays != nil && (*body.StaleManualDays < -1 || *body.StaleManualDays > 3650) {
276 s.writeAPIErr(w, r, fail(400, i18n.E("stale.err.days")))
277 return
278 }
274 279 if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, desc, vis)) {
275 280 return
276 281 }
@@ -279,8 +284,13 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
279 284 return
280 285 }
281 286 }
287 if body.StaleManualDays != nil {
288 if !s.apiOK(w, r, s.Store.SetRepoStaleManualDays(r.Context(), repo.ID, *body.StaleManualDays)) {
289 return
290 }
291 }
282 292 repo, _ = s.Store.RepoByPath(r.Context(), repo.OwnerPath, repo.Name)
283 writeJSON(w, http.StatusOK, projectJSON(repo))
293 writeJSON(w, http.StatusOK, s.projectJSONFull(r, repo))
284 294 }
285 295
286 296 func (s *Server) apiDeleteProject(w http.ResponseWriter, r *http.Request) {
@@ -781,3 +791,13 @@ func (s *Server) apiUnprotectBranch(w http.ResponseWriter, r *http.Request) {
781 791 func (s *Server) apiUnprotectTag(w http.ResponseWriter, r *http.Request) {
782 792 s.apiUnprotect(w, r, true)
783 793 }
794
795 // projectJSONFull is projectJSON plus stale_manual_days (-1 = instance-instelling).
796 func (s *Server) projectJSONFull(r *http.Request, repo store.Repo) map[string]any {
797 out := projectJSON(repo)
798 n, err := s.Store.RepoStaleManualDays(r.Context(), repo.ID)
799 if err == nil {
800 out["stale_manual_days"] = n
801 }
802 return out
803 }
@@ -242,7 +242,7 @@ func (s *Server) apiGetProject(w http.ResponseWriter, r *http.Request) {
242 if !ok {
242 if !ok {
243 return
243 return
244 }
244 }
245 writeJSON(w, http.StatusOK, projectJSON(repo))
245 writeJSON(w, http.StatusOK, s.projectJSONFull(r, repo))
246}
246}
247
247
248func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
248func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
@@ -254,6 +254,7 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
254 Description *string `json:"description"`
254 Description *string `json:"description"`
255 Visibility *string `json:"visibility"`
255 Visibility *string `json:"visibility"`
256 ReleaseVisibility *string `json:"release_visibility"`
256 ReleaseVisibility *string `json:"release_visibility"`
257 StaleManualDays *int `json:"stale_manual_days"`
257 }
258 }
258 if err := readJSON(r, &body); err != nil {
259 if err := readJSON(r, &body); err != nil {
259 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
260 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
@@ -271,6 +272,10 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
271 s.writeAPIErr(w, r, fail(400, i18n.E("err.releaseVisibility")))
272 s.writeAPIErr(w, r, fail(400, i18n.E("err.releaseVisibility")))
272 return
273 return
273 }
274 }
275 if body.StaleManualDays != nil && (*body.StaleManualDays < -1 || *body.StaleManualDays > 3650) {
276 s.writeAPIErr(w, r, fail(400, i18n.E("stale.err.days")))
277 return
278 }
274 if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, desc, vis)) {
279 if !s.apiOK(w, r, s.opUpdateRepo(r.Context(), apiUser(r), repo, desc, vis)) {
275 return
280 return
276 }
281 }
@@ -279,8 +284,13 @@ func (s *Server) apiPutProject(w http.ResponseWriter, r *http.Request) {
279 return
284 return
280 }
285 }
281 }
286 }
287 if body.StaleManualDays != nil {
288 if !s.apiOK(w, r, s.Store.SetRepoStaleManualDays(r.Context(), repo.ID, *body.StaleManualDays)) {
289 return
290 }
291 }
282 repo, _ = s.Store.RepoByPath(r.Context(), repo.OwnerPath, repo.Name)
292 repo, _ = s.Store.RepoByPath(r.Context(), repo.OwnerPath, repo.Name)
283 writeJSON(w, http.StatusOK, projectJSON(repo))
293 writeJSON(w, http.StatusOK, s.projectJSONFull(r, repo))
284}
294}
285
295
286func (s *Server) apiDeleteProject(w http.ResponseWriter, r *http.Request) {
296func (s *Server) apiDeleteProject(w http.ResponseWriter, r *http.Request) {
@@ -781,3 +791,13 @@ func (s *Server) apiUnprotectBranch(w http.ResponseWriter, r *http.Request) {
781func (s *Server) apiUnprotectTag(w http.ResponseWriter, r *http.Request) {
791func (s *Server) apiUnprotectTag(w http.ResponseWriter, r *http.Request) {
782 s.apiUnprotect(w, r, true)
792 s.apiUnprotect(w, r, true)
783}
793}
794
795// projectJSONFull is projectJSON plus stale_manual_days (-1 = instance-instelling).
796func (s *Server) projectJSONFull(r *http.Request, repo store.Repo) map[string]any {
797 out := projectJSON(repo)
798 n, err := s.Store.RepoStaleManualDays(r.Context(), repo.ID)
799 if err == nil {
800 out["stale_manual_days"] = n
801 }
802 return out
803}
internal/server/api_openapi.go +3 −3
@@ -249,7 +249,7 @@ func apiSchemas() map[string]any {
249 249 "ref": str("Git ref, for example refs/heads/master."),
250 250 "status": str("Pipeline status: queued, running, success, failed, canceled, waiting_for_update, waiting_for_job or manual. manual means only manual jobs are left, plus jobs that wait on them; such a pipeline is not running and has no finished_at until a manual job is played. A pipeline stopped by a newer pipeline stays canceled; see cancel_reason."),
251 251 "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."),
252 "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."),
252 "cancel_reason": str("For status canceled: superseded (a newer pipeline started for the same ref; also for manual jobs that expired that way), stale (a manual job expired because its pipeline waited only for manual action longer than stale_manual_days) or manual. Null otherwise. Only in list and get responses."),
253 253 "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."},
254 254 "source": str("Trigger source."),
255 255 "actor": str("Username that started the pipeline."),
@@ -274,8 +274,8 @@ func apiSchemas() map[string]any {
274 274 "stage": str("Stage name."),
275 275 "status": str("Job status."),
276 276 "when": str("When the job runs."),
277 "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."),
278 "cancel_reason": str("For status canceled: superseded or manual. Null otherwise."),
277 "display_status": str("Status as the UI shows it: obsolete for a job canceled because a newer pipeline started for the same ref or an expired manual job, otherwise equal to status."),
278 "cancel_reason": str("For status canceled: superseded, stale (expired manual job) or manual. Null otherwise."),
279 279 "do_not_interrupt": boolean("doNotInterrupt is set: the job is never stopped automatically, and cancelling it while it runs needs force=true."),
280 280 "failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),
281 281 "allow_failure": boolean("A failed job does not fail the pipeline."),
@@ -249,7 +249,7 @@ func apiSchemas() map[string]any {
249 "ref": str("Git ref, for example refs/heads/master."),
249 "ref": str("Git ref, for example refs/heads/master."),
250 "status": str("Pipeline status: queued, running, success, failed, canceled, waiting_for_update, waiting_for_job or manual. manual means only manual jobs are left, plus jobs that wait on them; such a pipeline is not running and has no finished_at until a manual job is played. A pipeline stopped by a newer pipeline stays canceled; see cancel_reason."),
250 "status": str("Pipeline status: queued, running, success, failed, canceled, waiting_for_update, waiting_for_job or manual. manual means only manual jobs are left, plus jobs that wait on them; such a pipeline is not running and has no finished_at until a manual job is played. A pipeline stopped by a newer pipeline stays canceled; see cancel_reason."),
251 "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."),
251 "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."),
252 "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."),
252 "cancel_reason": str("For status canceled: superseded (a newer pipeline started for the same ref; also for manual jobs that expired that way), stale (a manual job expired because its pipeline waited only for manual action longer than stale_manual_days) or manual. Null otherwise. Only in list and get responses."),
253 "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."},
253 "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."},
254 "source": str("Trigger source."),
254 "source": str("Trigger source."),
255 "actor": str("Username that started the pipeline."),
255 "actor": str("Username that started the pipeline."),
@@ -274,8 +274,8 @@ func apiSchemas() map[string]any {
274 "stage": str("Stage name."),
274 "stage": str("Stage name."),
275 "status": str("Job status."),
275 "status": str("Job status."),
276 "when": str("When the job runs."),
276 "when": str("When the job runs."),
277 "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."),
277 "display_status": str("Status as the UI shows it: obsolete for a job canceled because a newer pipeline started for the same ref or an expired manual job, otherwise equal to status."),
278 "cancel_reason": str("For status canceled: superseded or manual. Null otherwise."),
278 "cancel_reason": str("For status canceled: superseded, stale (expired manual job) or manual. Null otherwise."),
279 "do_not_interrupt": boolean("doNotInterrupt is set: the job is never stopped automatically, and cancelling it while it runs needs force=true."),
279 "do_not_interrupt": boolean("doNotInterrupt is set: the job is never stopped automatically, and cancelling it while it runs needs force=true."),
280 "failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),
280 "failure_reason": str("For status failed: job_execution_timeout, script_failure or runner_system_failure when known. Null otherwise."),
281 "allow_failure": boolean("A failed job does not fail the pipeline."),
281 "allow_failure": boolean("A failed job does not fail the pipeline."),
internal/server/api_routes.go +3 −0
@@ -7,6 +7,9 @@ import (
7 7 )
8 8
9 9 var apiCatalog = []apiRoute{
10 {http.MethodGet, "/api/v1/admin/pipelines/settings", access.ScopeAdmin, authUser, "Pipeline settings: stale_manual_days (instance admin)", (*Server).apiAdminPipelineSettings},
11 {http.MethodPut, "/api/v1/admin/pipelines/settings", access.ScopeAdmin, authUser, "Change stale_manual_days: manual jobs expire when their pipeline waited only for manual action this many days; 0 = off (instance admin)", (*Server).apiAdminPipelineSettings},
12 {http.MethodPost, "/api/v1/admin/pipelines/expire-stale", access.ScopeAdmin, authUser, "Expire stale manual jobs now (superseded and age rule) and list what expired (instance admin)", (*Server).apiAdminExpireStale},
10 13 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
11 14 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
12 15 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
@@ -7,6 +7,9 @@ import (
7)
7)
8
8
9var apiCatalog = []apiRoute{
9var apiCatalog = []apiRoute{
10 {http.MethodGet, "/api/v1/admin/pipelines/settings", access.ScopeAdmin, authUser, "Pipeline settings: stale_manual_days (instance admin)", (*Server).apiAdminPipelineSettings},
11 {http.MethodPut, "/api/v1/admin/pipelines/settings", access.ScopeAdmin, authUser, "Change stale_manual_days: manual jobs expire when their pipeline waited only for manual action this many days; 0 = off (instance admin)", (*Server).apiAdminPipelineSettings},
12 {http.MethodPost, "/api/v1/admin/pipelines/expire-stale", access.ScopeAdmin, authUser, "Expire stale manual jobs now (superseded and age rule) and list what expired (instance admin)", (*Server).apiAdminExpireStale},
10 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
13 {http.MethodGet, "/api/v1/admin/users", access.ScopeAdmin, authUser, "List users and their admin status (instance admin)", (*Server).apiAdminUsers},
11 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
14 {http.MethodPut, "/api/v1/admin/users/{username}/admin", access.ScopeAdmin, authUser, "Grant or revoke instance admin (instance admin; not yourself)", (*Server).apiAdminUserRole},
12 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
15 {http.MethodGet, "/api/v1/admin/runner/status", access.ScopeRunnerRead, authUser, "Built-in runner status (instance admin)", (*Server).apiAdminRunnerStatus},
internal/server/events.go +1 −0
@@ -169,6 +169,7 @@ func (s *Server) startPipeline(ctx context.Context, repo store.Repo, sha, ref, a
169 169 }
170 170 if created {
171 171 s.cancelOlder(ctx, repo.ID, ref, id)
172 s.expireSuperseded(ctx, repo.ID, ref, id)
172 173 }
173 174 return id
174 175 }
@@ -169,6 +169,7 @@ func (s *Server) startPipeline(ctx context.Context, repo store.Repo, sha, ref, a
169 }
169 }
170 if created {
170 if created {
171 s.cancelOlder(ctx, repo.ID, ref, id)
171 s.cancelOlder(ctx, repo.ID, ref, id)
172 s.expireSuperseded(ctx, repo.ID, ref, id)
172 }
173 }
173 return id
174 return id
174}
175}
internal/server/ops_ci.go +3 −0
@@ -66,6 +66,9 @@ func (s *Server) opJobActionForce(ctx context.Context, user store.User, repo sto
66 66 if !found {
67 67 return store.Job{}, fail(404, i18n.E("err.notFound"))
68 68 }
69 if (action == "play" || action == "retry") && expiredManualJob(job) {
70 return store.Job{}, fail(409, i18n.E("err.jobExpired", job.Name))
71 }
69 72 switch action {
70 73 case "play":
71 74 ok, err := s.Store.QueueJob(ctx, job.ID)
@@ -66,6 +66,9 @@ func (s *Server) opJobActionForce(ctx context.Context, user store.User, repo sto
66 if !found {
66 if !found {
67 return store.Job{}, fail(404, i18n.E("err.notFound"))
67 return store.Job{}, fail(404, i18n.E("err.notFound"))
68 }
68 }
69 if (action == "play" || action == "retry") && expiredManualJob(job) {
70 return store.Job{}, fail(409, i18n.E("err.jobExpired", job.Name))
71 }
69 switch action {
72 switch action {
70 case "play":
73 case "play":
71 ok, err := s.Store.QueueJob(ctx, job.ID)
74 ok, err := s.Store.QueueJob(ctx, job.ID)
internal/server/pipeline_page.go +13 −0
@@ -129,6 +129,7 @@ func (s *Server) cancelPipelineWeb(w http.ResponseWriter, r *http.Request) {
129 129
130 130 // JobPage is de console van één job.
131 131 type JobPage struct {
132 Expired string // uitleg als dit een verlopen handmatige job is
132 133 Job store.Job
133 134 Runner string
134 135 Pipe store.Pipeline
@@ -700,6 +701,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
700 701 PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
701 702 Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",
702 703 LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),
704 Expired: expiredText(tr, job),
703 705 Cancel: jobCancel(tr, role.CanWriteCode(), job),
704 706 Queue: queueText(tr, ranks, job.ID),
705 707 Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),
@@ -942,3 +944,14 @@ func allCanceledObsolete(jobs []store.Job) bool {
942 944 }
943 945 return seen
944 946 }
947
948 // expiredText legt uit waarom een verlopen handmatige job niet meer start.
949 func expiredText(tr func(string, ...any) string, j store.Job) string {
950 if !expiredManualJob(j) {
951 return ""
952 }
953 if j.Reason == store.ReasonStaleManual {
954 return tr("stale.expired.age")
955 }
956 return tr("stale.expired.superseded")
957 }
@@ -129,6 +129,7 @@ func (s *Server) cancelPipelineWeb(w http.ResponseWriter, r *http.Request) {
129
129
130// JobPage is de console van één job.
130// JobPage is de console van één job.
131type JobPage struct {
131type JobPage struct {
132 Expired string // uitleg als dit een verlopen handmatige job is
132 Job store.Job
133 Job store.Job
133 Runner string
134 Runner string
134 Pipe store.Pipeline
135 Pipe store.Pipeline
@@ -700,6 +701,7 @@ func (s *Server) jobPage(r *http.Request, repo store.Repo, p store.Pipeline, job
700 PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
701 PipeStatus: pipeStatus, PipeLabel: s.tr(r, "pipe."+pipeStatus),
701 Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",
702 Stages: stages, Related: related, Blocks: parseLog(job.Log), Running: job.Status == "running" || job.Status == "queued",
702 LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),
703 LogBytes: len(job.Log), CanPlay: job.Status == "manual" && role.CanWriteCode(),
704 Expired: expiredText(tr, job),
703 Cancel: jobCancel(tr, role.CanWriteCode(), job),
705 Cancel: jobCancel(tr, role.CanWriteCode(), job),
704 Queue: queueText(tr, ranks, job.ID),
706 Queue: queueText(tr, ranks, job.ID),
705 Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),
707 Environment: job.Environment, EnvironmentURL: job.EnvironmentURL, EnvironmentLink: safeEnvironmentURL(job.EnvironmentURL),
@@ -942,3 +944,14 @@ func allCanceledObsolete(jobs []store.Job) bool {
942 }
944 }
943 return seen
945 return seen
944}
946}
947
948// expiredText legt uit waarom een verlopen handmatige job niet meer start.
949func expiredText(tr func(string, ...any) string, j store.Job) string {
950 if !expiredManualJob(j) {
951 return ""
952 }
953 if j.Reason == store.ReasonStaleManual {
954 return tr("stale.expired.age")
955 }
956 return tr("stale.expired.superseded")
957}
internal/server/server.go +2 −0
@@ -697,6 +697,8 @@ type View struct {
697 697 HelpDoc *HelpDoc
698 698 RunnerUI template.HTML
699 699 AdminUsers []AdminUserRow
700 StaleDays int // Beheer > Pipelines: instance-instelling; repo-instellingen: eigen waarde (-1 = volgen)
701 StaleDaysDefault int
700 702 ReleaseOnly bool
701 703 ShowReleases bool
702 704 ReleaseRepos []store.Repo
@@ -697,6 +697,8 @@ type View struct {
697 HelpDoc *HelpDoc
697 HelpDoc *HelpDoc
698 RunnerUI template.HTML
698 RunnerUI template.HTML
699 AdminUsers []AdminUserRow
699 AdminUsers []AdminUserRow
700 StaleDays int // Beheer > Pipelines: instance-instelling; repo-instellingen: eigen waarde (-1 = volgen)
701 StaleDaysDefault int
700 ReleaseOnly bool
702 ReleaseOnly bool
701 ShowReleases bool
703 ShowReleases bool
702 ReleaseRepos []store.Repo
704 ReleaseRepos []store.Repo
internal/server/settings_handlers.go +17 −0
@@ -41,6 +41,8 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
41 41 v.HookTargets = s.hookTargets(r)
42 42 s.fillHookEdit(r, &v, "repo", repo.ID)
43 43 s.fillApproval(r, &v, repo)
44 v.StaleDays, _ = s.Store.RepoStaleManualDays(r.Context(), repo.ID)
45 v.StaleDaysDefault, _ = s.Store.StaleManualDays(r.Context())
44 46 }
45 47 s.render(w, "settings", v)
46 48 }
@@ -202,6 +204,21 @@ func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {
202 204 return
203 205 }
204 206 }
207 if sd := strings.TrimSpace(r.FormValue("stale_manual_days")); sd != "" || r.Form.Has("stale_manual_days") {
208 n := -1
209 if sd != "" {
210 v, err := strconv.Atoi(sd)
211 if err != nil {
212 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.tr(r, "stale.err.days"))
213 return
214 }
215 n = v
216 }
217 if err := s.Store.SetRepoStaleManualDays(r.Context(), repo.ID, n); err != nil {
218 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.tr(r, "stale.err.days"))
219 return
220 }
221 }
205 222 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")
206 223 }
207 224
@@ -41,6 +41,8 @@ func (s *Server) settings(w http.ResponseWriter, r *http.Request) {
41 v.HookTargets = s.hookTargets(r)
41 v.HookTargets = s.hookTargets(r)
42 s.fillHookEdit(r, &v, "repo", repo.ID)
42 s.fillHookEdit(r, &v, "repo", repo.ID)
43 s.fillApproval(r, &v, repo)
43 s.fillApproval(r, &v, repo)
44 v.StaleDays, _ = s.Store.RepoStaleManualDays(r.Context(), repo.ID)
45 v.StaleDaysDefault, _ = s.Store.StaleManualDays(r.Context())
44 }
46 }
45 s.render(w, "settings", v)
47 s.render(w, "settings", v)
46}
48}
@@ -202,6 +204,21 @@ func (s *Server) updateRepo(w http.ResponseWriter, r *http.Request) {
202 return
204 return
203 }
205 }
204 }
206 }
207 if sd := strings.TrimSpace(r.FormValue("stale_manual_days")); sd != "" || r.Form.Has("stale_manual_days") {
208 n := -1
209 if sd != "" {
210 v, err := strconv.Atoi(sd)
211 if err != nil {
212 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.tr(r, "stale.err.days"))
213 return
214 }
215 n = v
216 }
217 if err := s.Store.SetRepoStaleManualDays(r.Context(), repo.ID, n); err != nil {
218 s.redirect(w, r, repoURL(repo)+"/-/settings", "", s.tr(r, "stale.err.days"))
219 return
220 }
221 }
205 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")
222 s.redirect(w, r, repoURL(repo)+"/-/settings", s.tr(r, "flash.saved"), "")
206}
223}
207
224
internal/server/stale_manual.go added +145 −0
@@ -0,0 +1,145 @@
1 package server
2
3 import (
4 "context"
5 "net/http"
6 "strconv"
7 "strings"
8 "time"
9
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/store"
12 )
13
14 // Verlopen handmatige jobs: zie store/stale_manual.go voor de regels.
15
16 // expiredManualJob is true voor een handmatige job die verlopen is; die kan
17 // niet meer gestart of opnieuw gestart worden.
18 func expiredManualJob(j store.Job) bool {
19 if j.Status != "canceled" {
20 return false
21 }
22 return j.Reason == store.ReasonStaleManual || (j.Reason == store.ReasonSuperseded && j.When == "manual")
23 }
24
25 // expireSuperseded laat handmatige jobs van oudere pipelines op dezelfde ref
26 // verlopen zodra een nieuwe pipeline gemaakt is.
27 func (s *Server) expireSuperseded(ctx context.Context, repoID int64, ref string, keep int64) {
28 out, err := s.Store.ExpireSupersededManual(ctx, repoID, ref, keep)
29 if err != nil && s.Log != nil {
30 s.Log.Error("stale manual", "err", err)
31 }
32 s.logExpired(ctx, out)
33 }
34
35 func (s *Server) logExpired(ctx context.Context, out []store.ExpiredManual) {
36 if s.Log == nil {
37 return
38 }
39 for _, e := range out {
40 path := strconv.FormatInt(e.RepoID, 10)
41 if r, err := s.Store.RepoByID(ctx, e.RepoID); err == nil {
42 path = r.FullPath()
43 }
44 s.Log.Info("stale manual expired", "repo", path, "pipeline", e.PipelineID, "ref", e.Ref, "jobs", e.Jobs, "reason", e.Reason)
45 }
46 }
47
48 // StaleManualSweeper ruimt kort na de start en daarna elk uur verlopen
49 // handmatige jobs op.
50 func (s *Server) StaleManualSweeper(ctx context.Context) {
51 first := time.NewTimer(time.Minute)
52 defer first.Stop()
53 t := time.NewTicker(time.Hour)
54 defer t.Stop()
55 for {
56 select {
57 case <-ctx.Done():
58 return
59 case <-first.C:
60 case <-t.C:
61 }
62 out, err := s.Store.SweepStaleManual(ctx, time.Now())
63 if err != nil && s.Log != nil {
64 s.Log.Error("stale manual sweep", "err", err)
65 }
66 s.logExpired(ctx, out)
67 }
68 }
69
70 func (s *Server) adminPipelines(w http.ResponseWriter, r *http.Request) {
71 if ok, _ := s.adminOnly(w, r); !ok {
72 return
73 }
74 v := s.view(w, r, "title.admin")
75 v.Page = "adminpipelines"
76 v.StaleDays, _ = s.Store.StaleManualDays(r.Context())
77 v.StaleDaysDefault = store.DefaultStaleManualDays
78 s.render(w, "adminpipelines", v)
79 }
80
81 func (s *Server) adminPipelinesSave(w http.ResponseWriter, r *http.Request) {
82 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
83 return
84 }
85 n, err := strconv.Atoi(strings.TrimSpace(r.FormValue("stale_manual_days")))
86 if err != nil || s.Store.SetStaleManualDays(r.Context(), n) != nil {
87 s.redirect(w, r, "/admin/pipelines", "", s.tr(r, "stale.err.days"))
88 return
89 }
90 if s.Log != nil {
91 s.Log.Info("admin audit", "by", s.who(r).User.Username, "stale_manual_days", n)
92 }
93 s.redirect(w, r, "/admin/pipelines", s.tr(r, "flash.saved"), "")
94 }
95
96 func (s *Server) apiAdminPipelineSettings(w http.ResponseWriter, r *http.Request) {
97 if !apiUser(r).InstanceAdmin {
98 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
99 return
100 }
101 if r.Method == http.MethodPut {
102 var in struct {
103 Days *int `json:"stale_manual_days"`
104 }
105 if err := readJSON(r, &in); err != nil || in.Days == nil {
106 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
107 return
108 }
109 if err := s.Store.SetStaleManualDays(r.Context(), *in.Days); err != nil {
110 s.writeAPIErr(w, r, fail(400, i18n.E("stale.err.days")))
111 return
112 }
113 if s.Log != nil {
114 s.Log.Info("admin audit", "by", apiUser(r).Username, "stale_manual_days", *in.Days)
115 }
116 }
117 n, err := s.Store.StaleManualDays(r.Context())
118 if err != nil {
119 s.writeAPIErr(w, r, err)
120 return
121 }
122 writeJSON(w, http.StatusOK, map[string]any{"stale_manual_days": n, "default": store.DefaultStaleManualDays})
123 }
124
125 func (s *Server) apiAdminExpireStale(w http.ResponseWriter, r *http.Request) {
126 if !apiUser(r).InstanceAdmin {
127 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
128 return
129 }
130 out, err := s.Store.SweepStaleManual(r.Context(), time.Now())
131 s.logExpired(r.Context(), out)
132 if err != nil {
133 s.writeAPIErr(w, r, err)
134 return
135 }
136 list := []map[string]any{}
137 for _, e := range out {
138 path := ""
139 if rp, err := s.Store.RepoByID(r.Context(), e.RepoID); err == nil {
140 path = rp.FullPath()
141 }
142 list = append(list, map[string]any{"project": path, "pipeline_id": e.PipelineID, "ref": e.Ref, "jobs": e.Jobs, "reason": e.Reason})
143 }
144 writeJSON(w, http.StatusOK, list)
145 }
@@ -0,0 +1,145 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "strconv"
7 "strings"
8 "time"
9
10 "gitlab.com/Timfa/bluegit/internal/i18n"
11 "gitlab.com/Timfa/bluegit/internal/store"
12)
13
14// Verlopen handmatige jobs: zie store/stale_manual.go voor de regels.
15
16// expiredManualJob is true voor een handmatige job die verlopen is; die kan
17// niet meer gestart of opnieuw gestart worden.
18func expiredManualJob(j store.Job) bool {
19 if j.Status != "canceled" {
20 return false
21 }
22 return j.Reason == store.ReasonStaleManual || (j.Reason == store.ReasonSuperseded && j.When == "manual")
23}
24
25// expireSuperseded laat handmatige jobs van oudere pipelines op dezelfde ref
26// verlopen zodra een nieuwe pipeline gemaakt is.
27func (s *Server) expireSuperseded(ctx context.Context, repoID int64, ref string, keep int64) {
28 out, err := s.Store.ExpireSupersededManual(ctx, repoID, ref, keep)
29 if err != nil && s.Log != nil {
30 s.Log.Error("stale manual", "err", err)
31 }
32 s.logExpired(ctx, out)
33}
34
35func (s *Server) logExpired(ctx context.Context, out []store.ExpiredManual) {
36 if s.Log == nil {
37 return
38 }
39 for _, e := range out {
40 path := strconv.FormatInt(e.RepoID, 10)
41 if r, err := s.Store.RepoByID(ctx, e.RepoID); err == nil {
42 path = r.FullPath()
43 }
44 s.Log.Info("stale manual expired", "repo", path, "pipeline", e.PipelineID, "ref", e.Ref, "jobs", e.Jobs, "reason", e.Reason)
45 }
46}
47
48// StaleManualSweeper ruimt kort na de start en daarna elk uur verlopen
49// handmatige jobs op.
50func (s *Server) StaleManualSweeper(ctx context.Context) {
51 first := time.NewTimer(time.Minute)
52 defer first.Stop()
53 t := time.NewTicker(time.Hour)
54 defer t.Stop()
55 for {
56 select {
57 case <-ctx.Done():
58 return
59 case <-first.C:
60 case <-t.C:
61 }
62 out, err := s.Store.SweepStaleManual(ctx, time.Now())
63 if err != nil && s.Log != nil {
64 s.Log.Error("stale manual sweep", "err", err)
65 }
66 s.logExpired(ctx, out)
67 }
68}
69
70func (s *Server) adminPipelines(w http.ResponseWriter, r *http.Request) {
71 if ok, _ := s.adminOnly(w, r); !ok {
72 return
73 }
74 v := s.view(w, r, "title.admin")
75 v.Page = "adminpipelines"
76 v.StaleDays, _ = s.Store.StaleManualDays(r.Context())
77 v.StaleDaysDefault = store.DefaultStaleManualDays
78 s.render(w, "adminpipelines", v)
79}
80
81func (s *Server) adminPipelinesSave(w http.ResponseWriter, r *http.Request) {
82 if ok, _ := s.adminOnly(w, r); !ok || !s.csrfOK(w, r) {
83 return
84 }
85 n, err := strconv.Atoi(strings.TrimSpace(r.FormValue("stale_manual_days")))
86 if err != nil || s.Store.SetStaleManualDays(r.Context(), n) != nil {
87 s.redirect(w, r, "/admin/pipelines", "", s.tr(r, "stale.err.days"))
88 return
89 }
90 if s.Log != nil {
91 s.Log.Info("admin audit", "by", s.who(r).User.Username, "stale_manual_days", n)
92 }
93 s.redirect(w, r, "/admin/pipelines", s.tr(r, "flash.saved"), "")
94}
95
96func (s *Server) apiAdminPipelineSettings(w http.ResponseWriter, r *http.Request) {
97 if !apiUser(r).InstanceAdmin {
98 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
99 return
100 }
101 if r.Method == http.MethodPut {
102 var in struct {
103 Days *int `json:"stale_manual_days"`
104 }
105 if err := readJSON(r, &in); err != nil || in.Days == nil {
106 s.writeAPIErr(w, r, fail(400, i18n.E("err.json")))
107 return
108 }
109 if err := s.Store.SetStaleManualDays(r.Context(), *in.Days); err != nil {
110 s.writeAPIErr(w, r, fail(400, i18n.E("stale.err.days")))
111 return
112 }
113 if s.Log != nil {
114 s.Log.Info("admin audit", "by", apiUser(r).Username, "stale_manual_days", *in.Days)
115 }
116 }
117 n, err := s.Store.StaleManualDays(r.Context())
118 if err != nil {
119 s.writeAPIErr(w, r, err)
120 return
121 }
122 writeJSON(w, http.StatusOK, map[string]any{"stale_manual_days": n, "default": store.DefaultStaleManualDays})
123}
124
125func (s *Server) apiAdminExpireStale(w http.ResponseWriter, r *http.Request) {
126 if !apiUser(r).InstanceAdmin {
127 s.writeAPIErr(w, r, fail(403, i18n.E("err.forbidden")))
128 return
129 }
130 out, err := s.Store.SweepStaleManual(r.Context(), time.Now())
131 s.logExpired(r.Context(), out)
132 if err != nil {
133 s.writeAPIErr(w, r, err)
134 return
135 }
136 list := []map[string]any{}
137 for _, e := range out {
138 path := ""
139 if rp, err := s.Store.RepoByID(r.Context(), e.RepoID); err == nil {
140 path = rp.FullPath()
141 }
142 list = append(list, map[string]any{"project": path, "pipeline_id": e.PipelineID, "ref": e.Ref, "jobs": e.Jobs, "reason": e.Reason})
143 }
144 writeJSON(w, http.StatusOK, list)
145}
internal/server/stale_manual_test.go added +101 −0
@@ -0,0 +1,101 @@
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 "strconv"
12 "strings"
13 "testing"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18 )
19
20 func TestStaleManualPlayBlockedAndAdmin(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 cfg := config.Config{
31 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
33 Git: config.Git{Binary: "git", DefaultBranch: "master"},
34 }
35 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36 ts := httptest.NewServer(srv.Handler())
37 t.Cleanup(ts.Close)
38 jar, _ := cookiejar.New(nil)
39 tim := &http.Client{Jar: jar}
40 page := read(t, mustGet(t, tim, ts.URL+"/login"))
41 csrf := csrfOf(t, page)
42 if _, err := tim.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrf}, "name": {"rel"}, "visibility": {"public"}}); err != nil {
43 t.Fatal(err)
44 }
45 ctx := context.Background()
46 repo, err := st.RepoByPath(ctx, "tim", "rel")
47 if err != nil {
48 t.Fatal(err)
49 }
50 mk := func(sha string) (int64, int64) {
51 id, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "tim", "x", []store.NewJob{
52 {Name: "release", Stage: "release", Script: "true", When: "manual"},
53 })
54 if err != nil {
55 t.Fatal(err)
56 }
57 js, _ := st.JobsByPipeline(ctx, id)
58 return id, js[0].ID
59 }
60 oldP, oldJ := mk("a1")
61 newP, newJ := mk("a2")
62 srv.expireSuperseded(ctx, repo.ID, "refs/heads/master", newP)
63
64 u, _ := st.UserByUsername(ctx, "tim")
65 if _, err := srv.opJobAction(ctx, u, repo, oldP, oldJ, "play"); err == nil || statusOf(err) != 409 {
66 t.Fatalf("verlopen play: %v", err)
67 }
68 if _, err := srv.opJobAction(ctx, u, repo, oldP, oldJ, "retry"); err == nil || statusOf(err) != 409 {
69 t.Fatalf("verlopen retry: %v", err)
70 }
71 // Jobpagina: melding via eigen modal (data-alert), geen startformulier.
72 body := read(t, mustGet(t, tim, ts.URL+"/tim/rel/-/pipelines/"+strconv.FormatInt(oldP, 10)+"/jobs/"+strconv.FormatInt(oldJ, 10)))
73 if !strings.Contains(body, "data-alert=") || strings.Contains(body, "/jobs/"+strconv.FormatInt(oldJ, 10)+"/play") {
74 t.Fatal("jobpagina mist modal of heeft nog startformulier")
75 }
76 // Nieuwste blijft startbaar.
77 if j, err := srv.opJobAction(ctx, u, repo, newP, newJ, "play"); err != nil || j.Status != "queued" {
78 t.Fatalf("nieuwste: %v %s", err, j.Status)
79 }
80 // Beheer > Pipelines.
81 ap := read(t, mustGet(t, tim, ts.URL+"/admin/pipelines"))
82 if !strings.Contains(ap, `name="stale_manual_days"`) {
83 t.Fatal("beheerpagina")
84 }
85 if _, err := tim.PostForm(ts.URL+"/admin/pipelines", url.Values{"csrf": {csrfOf(t, ap)}, "stale_manual_days": {"0"}}); err != nil {
86 t.Fatal(err)
87 }
88 if d, _ := st.StaleManualDays(ctx); d != 0 {
89 t.Fatalf("instelling %d", d)
90 }
91 sp := read(t, mustGet(t, tim, ts.URL+"/tim/rel/-/settings"))
92 if !strings.Contains(sp, `name="stale_manual_days"`) {
93 t.Fatal("projectinstelling ontbreekt")
94 }
95 if _, err := tim.PostForm(ts.URL+"/tim/rel/-/settings", url.Values{"csrf": {csrfOf(t, sp)}, "visibility": {"public"}, "stale_manual_days": {"3"}}); err != nil {
96 t.Fatal(err)
97 }
98 if d, _ := st.RepoStaleManualDays(ctx, repo.ID); d != 3 {
99 t.Fatalf("project %d", d)
100 }
101 }
@@ -0,0 +1,101 @@
1package server
2
3import (
4 "context"
5 "net/http"
6 "net/http/cookiejar"
7 "net/http/httptest"
8 "net/url"
9 "os/exec"
10 "path/filepath"
11 "strconv"
12 "strings"
13 "testing"
14
15 "gitlab.com/Timfa/bluegit/internal/auth"
16 "gitlab.com/Timfa/bluegit/internal/config"
17 "gitlab.com/Timfa/bluegit/internal/store"
18)
19
20func TestStaleManualPlayBlockedAndAdmin(t *testing.T) {
21 if _, err := exec.LookPath("git"); err != nil {
22 t.Skip("git ontbreekt")
23 }
24 storage := t.TempDir()
25 st, err := store.Open(filepath.Join(storage, "bluegit.db"), bytes32())
26 if err != nil {
27 t.Fatal(err)
28 }
29 t.Cleanup(func() { _ = st.Close() })
30 cfg := config.Config{
31 BaseURL: "http://127.0.0.1:9", Listen: "127.0.0.1:0", StoragePath: storage,
32 Auth: config.Auth{Mode: "dev", DevUser: "tim", DevAuthID: 1, UserAgent: "test", BaseURL: "https://auth.timfalken.com"},
33 Git: config.Git{Binary: "git", DefaultBranch: "master"},
34 }
35 srv := &Server{Cfg: cfg, Store: st, Auth: auth.Dev{Username: "tim", AuthID: 1}, Dev: true, Git: "git", HookBin: "/bin/true"}
36 ts := httptest.NewServer(srv.Handler())
37 t.Cleanup(ts.Close)
38 jar, _ := cookiejar.New(nil)
39 tim := &http.Client{Jar: jar}
40 page := read(t, mustGet(t, tim, ts.URL+"/login"))
41 csrf := csrfOf(t, page)
42 if _, err := tim.PostForm(ts.URL+"/new/repo", url.Values{"csrf": {csrf}, "name": {"rel"}, "visibility": {"public"}}); err != nil {
43 t.Fatal(err)
44 }
45 ctx := context.Background()
46 repo, err := st.RepoByPath(ctx, "tim", "rel")
47 if err != nil {
48 t.Fatal(err)
49 }
50 mk := func(sha string) (int64, int64) {
51 id, err := st.CreatePipeline(ctx, repo.ID, sha, "refs/heads/master", "push", "tim", "x", []store.NewJob{
52 {Name: "release", Stage: "release", Script: "true", When: "manual"},
53 })
54 if err != nil {
55 t.Fatal(err)
56 }
57 js, _ := st.JobsByPipeline(ctx, id)
58 return id, js[0].ID
59 }
60 oldP, oldJ := mk("a1")
61 newP, newJ := mk("a2")
62 srv.expireSuperseded(ctx, repo.ID, "refs/heads/master", newP)
63
64 u, _ := st.UserByUsername(ctx, "tim")
65 if _, err := srv.opJobAction(ctx, u, repo, oldP, oldJ, "play"); err == nil || statusOf(err) != 409 {
66 t.Fatalf("verlopen play: %v", err)
67 }
68 if _, err := srv.opJobAction(ctx, u, repo, oldP, oldJ, "retry"); err == nil || statusOf(err) != 409 {
69 t.Fatalf("verlopen retry: %v", err)
70 }
71 // Jobpagina: melding via eigen modal (data-alert), geen startformulier.
72 body := read(t, mustGet(t, tim, ts.URL+"/tim/rel/-/pipelines/"+strconv.FormatInt(oldP, 10)+"/jobs/"+strconv.FormatInt(oldJ, 10)))
73 if !strings.Contains(body, "data-alert=") || strings.Contains(body, "/jobs/"+strconv.FormatInt(oldJ, 10)+"/play") {
74 t.Fatal("jobpagina mist modal of heeft nog startformulier")
75 }
76 // Nieuwste blijft startbaar.
77 if j, err := srv.opJobAction(ctx, u, repo, newP, newJ, "play"); err != nil || j.Status != "queued" {
78 t.Fatalf("nieuwste: %v %s", err, j.Status)
79 }
80 // Beheer > Pipelines.
81 ap := read(t, mustGet(t, tim, ts.URL+"/admin/pipelines"))
82 if !strings.Contains(ap, `name="stale_manual_days"`) {
83 t.Fatal("beheerpagina")
84 }
85 if _, err := tim.PostForm(ts.URL+"/admin/pipelines", url.Values{"csrf": {csrfOf(t, ap)}, "stale_manual_days": {"0"}}); err != nil {
86 t.Fatal(err)
87 }
88 if d, _ := st.StaleManualDays(ctx); d != 0 {
89 t.Fatalf("instelling %d", d)
90 }
91 sp := read(t, mustGet(t, tim, ts.URL+"/tim/rel/-/settings"))
92 if !strings.Contains(sp, `name="stale_manual_days"`) {
93 t.Fatal("projectinstelling ontbreekt")
94 }
95 if _, err := tim.PostForm(ts.URL+"/tim/rel/-/settings", url.Values{"csrf": {csrfOf(t, sp)}, "visibility": {"public"}, "stale_manual_days": {"3"}}); err != nil {
96 t.Fatal(err)
97 }
98 if d, _ := st.RepoStaleManualDays(ctx, repo.ID); d != 3 {
99 t.Fatalf("project %d", d)
100 }
101}
internal/server/static/confirm.js +8 −0
@@ -66,6 +66,14 @@
66 66 return p.then(function (v) { cancelBtn.style.display = ""; return v; });
67 67 }
68 68 window.BGModal = { confirm: ask, alert: alertBox };
69 // Knoppen met data-alert="tekst" tonen alleen een melding (bijv. waarom
70 // een verlopen handmatige job niet meer kan starten).
71 document.addEventListener("click", function (ev) {
72 var b = ev.target && ev.target.closest ? ev.target.closest("[data-alert]") : null;
73 if (!b) { return; }
74 ev.preventDefault();
75 alertBox(b.getAttribute("data-alert"), { title: b.getAttribute("data-alert-title") || undefined });
76 });
69 77 document.addEventListener("submit", function (ev) {
70 78 var form = ev.target;
71 79 if (!form || !form.getAttribute) { return; }
@@ -66,6 +66,14 @@
66 return p.then(function (v) { cancelBtn.style.display = ""; return v; });
66 return p.then(function (v) { cancelBtn.style.display = ""; return v; });
67 }
67 }
68 window.BGModal = { confirm: ask, alert: alertBox };
68 window.BGModal = { confirm: ask, alert: alertBox };
69 // Knoppen met data-alert="tekst" tonen alleen een melding (bijv. waarom
70 // een verlopen handmatige job niet meer kan starten).
71 document.addEventListener("click", function (ev) {
72 var b = ev.target && ev.target.closest ? ev.target.closest("[data-alert]") : null;
73 if (!b) { return; }
74 ev.preventDefault();
75 alertBox(b.getAttribute("data-alert"), { title: b.getAttribute("data-alert-title") || undefined });
76 });
69 document.addEventListener("submit", function (ev) {
77 document.addEventListener("submit", function (ev) {
70 var form = ev.target;
78 var form = ev.target;
71 if (!form || !form.getAttribute) { return; }
79 if (!form || !form.getAttribute) { return; }
internal/server/templates/collab.html +7 −0
@@ -489,6 +489,10 @@
489 489 </ul>
490 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 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}}
492 {{if .Expired}}
493 <p class="tiphost"><span class="pill">{{t "stale.pill"}}</span> {{tip "stale.pill.tip"}}</p>
494 <button type="button" class="ghost" data-alert="{{.Expired}}" data-alert-title="{{t "stale.modal.title"}}">{{t "pipe.play"}}</button>
495 {{end}}
492 496 {{if .CanPlay}}
493 497 <form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">
494 498 <input type="hidden" name="csrf" value="{{$.CSRF}}">
@@ -656,6 +660,9 @@
656 660 <option value="public" {{if eq .Repo.ReleaseVisibility "public"}}selected{{end}}>{{t "rel.vis.public"}}</option>
657 661 </select>
658 662 </label>
663 <label class="tiphost"><span class="rui-lbl">{{t "stale.repo.label"}} {{tip "stale.repo.tip"}}</span>
664 <input type="number" name="stale_manual_days" min="0" max="3650" value="{{if ge .StaleDays 0}}{{.StaleDays}}{{end}}" placeholder="{{t "stale.repo.inherit" .StaleDaysDefault}}">
665 </label>
659 666 <button type="submit">{{t "action.save"}}</button>
660 667 </form>
661 668 <form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">
@@ -489,6 +489,10 @@
489 </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}}
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}}
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}}
492 {{if .Expired}}
493 <p class="tiphost"><span class="pill">{{t "stale.pill"}}</span> {{tip "stale.pill.tip"}}</p>
494 <button type="button" class="ghost" data-alert="{{.Expired}}" data-alert-title="{{t "stale.modal.title"}}">{{t "pipe.play"}}</button>
495 {{end}}
492 {{if .CanPlay}}
496 {{if .CanPlay}}
493 <form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">
497 <form method="post" action="/{{$.Repo.FullPath}}/-/pipelines/{{.Pipe.ID}}/jobs/{{.Job.ID}}/play">
494 <input type="hidden" name="csrf" value="{{$.CSRF}}">
498 <input type="hidden" name="csrf" value="{{$.CSRF}}">
@@ -656,6 +660,9 @@
656 <option value="public" {{if eq .Repo.ReleaseVisibility "public"}}selected{{end}}>{{t "rel.vis.public"}}</option>
660 <option value="public" {{if eq .Repo.ReleaseVisibility "public"}}selected{{end}}>{{t "rel.vis.public"}}</option>
657 </select>
661 </select>
658 </label>
662 </label>
663 <label class="tiphost"><span class="rui-lbl">{{t "stale.repo.label"}} {{tip "stale.repo.tip"}}</span>
664 <input type="number" name="stale_manual_days" min="0" max="3650" value="{{if ge .StaleDays 0}}{{.StaleDays}}{{end}}" placeholder="{{t "stale.repo.inherit" .StaleDaysDefault}}">
665 </label>
659 <button type="submit">{{t "action.save"}}</button>
666 <button type="submit">{{t "action.save"}}</button>
660</form>
667</form>
661<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">
668<form class="panel" method="post" action="/{{.Repo.FullPath}}/-/logo" enctype="multipart/form-data">
internal/server/templates/help.html +15 −0
@@ -58,6 +58,21 @@
58 58 {{template "layout-end" .}}
59 59 {{end}}
60 60
61 {{define "adminpipelines"}}
62 {{template "layout-start" .}}
63 <h1>{{t "stale.admin.title"}}</h1>
64 <p class="muted">{{t "stale.admin.lead"}}</p>
65 <form class="panel" method="post" action="/admin/pipelines">
66 <input type="hidden" name="csrf" value="{{.CSRF}}">
67 <label class="tiphost"><span class="rui-lbl">{{t "stale.admin.days"}} {{tip "stale.admin.tip"}}</span>
68 <input type="number" name="stale_manual_days" min="0" max="3650" required value="{{.StaleDays}}">
69 </label>
70 <p class="muted">{{t "stale.admin.hint" .StaleDaysDefault}}</p>
71 <button type="submit">{{t "action.save"}}</button>
72 </form>
73 {{template "layout-end" .}}
74 {{end}}
75
61 76 {{define "adminusers"}}
62 77 {{template "layout-start" .}}
63 78 <h1>{{t "admin.users.title"}}</h1>
@@ -58,6 +58,21 @@
58{{template "layout-end" .}}
58{{template "layout-end" .}}
59{{end}}
59{{end}}
60
60
61{{define "adminpipelines"}}
62{{template "layout-start" .}}
63<h1>{{t "stale.admin.title"}}</h1>
64<p class="muted">{{t "stale.admin.lead"}}</p>
65<form class="panel" method="post" action="/admin/pipelines">
66 <input type="hidden" name="csrf" value="{{.CSRF}}">
67 <label class="tiphost"><span class="rui-lbl">{{t "stale.admin.days"}} {{tip "stale.admin.tip"}}</span>
68 <input type="number" name="stale_manual_days" min="0" max="3650" required value="{{.StaleDays}}">
69 </label>
70 <p class="muted">{{t "stale.admin.hint" .StaleDaysDefault}}</p>
71 <button type="submit">{{t "action.save"}}</button>
72</form>
73{{template "layout-end" .}}
74{{end}}
75
61{{define "adminusers"}}
76{{define "adminusers"}}
62{{template "layout-start" .}}
77{{template "layout-start" .}}
63<h1>{{t "admin.users.title"}}</h1>
78<h1>{{t "admin.users.title"}}</h1>
internal/store/flow.go +9 −1
@@ -1517,11 +1517,16 @@ func (s *Store) DeleteRelease(ctx context.Context, releaseID int64) ([]string, e
1517 1517 const (
1518 1518 ReasonSuperseded = "canceled_by_newer_pipeline"
1519 1519 ReasonManual = "canceled_by_user"
1520 // ReasonStaleManual: een handmatige job die verlopen is omdat zijn
1521 // pipeline te lang alleen nog op handmatige actie wachtte.
1522 ReasonStaleManual = "canceled_stale_manual"
1520 1523 )
1521 1524
1522 1525 // Obsolete is true voor een job die geannuleerd is omdat een nieuwere
1523 1526 // pipeline op dezelfde ref startte.
1524 func (j Job) Obsolete() bool { return j.Status == "canceled" && j.Reason == ReasonSuperseded }
1527 func (j Job) Obsolete() bool {
1528 return j.Status == "canceled" && (j.Reason == ReasonSuperseded || j.Reason == ReasonStaleManual)
1529 }
1525 1530
1526 1531 // CancelReason geeft "superseded" of "manual" voor een geannuleerde job,
1527 1532 // anders "".
@@ -1532,6 +1537,9 @@ func (j Job) CancelReason() string {
1532 1537 if j.Reason == ReasonSuperseded {
1533 1538 return "superseded"
1534 1539 }
1540 if j.Reason == ReasonStaleManual {
1541 return "stale"
1542 }
1535 1543 return "manual"
1536 1544 }
1537 1545
@@ -1517,11 +1517,16 @@ func (s *Store) DeleteRelease(ctx context.Context, releaseID int64) ([]string, e
1517const (
1517const (
1518 ReasonSuperseded = "canceled_by_newer_pipeline"
1518 ReasonSuperseded = "canceled_by_newer_pipeline"
1519 ReasonManual = "canceled_by_user"
1519 ReasonManual = "canceled_by_user"
1520 // ReasonStaleManual: een handmatige job die verlopen is omdat zijn
1521 // pipeline te lang alleen nog op handmatige actie wachtte.
1522 ReasonStaleManual = "canceled_stale_manual"
1520)
1523)
1521
1524
1522// Obsolete is true voor een job die geannuleerd is omdat een nieuwere
1525// Obsolete is true voor een job die geannuleerd is omdat een nieuwere
1523// pipeline op dezelfde ref startte.
1526// pipeline op dezelfde ref startte.
1524func (j Job) Obsolete() bool { return j.Status == "canceled" && j.Reason == ReasonSuperseded }
1527func (j Job) Obsolete() bool {
1528 return j.Status == "canceled" && (j.Reason == ReasonSuperseded || j.Reason == ReasonStaleManual)
1529}
1525
1530
1526// CancelReason geeft "superseded" of "manual" voor een geannuleerde job,
1531// CancelReason geeft "superseded" of "manual" voor een geannuleerde job,
1527// anders "".
1532// anders "".
@@ -1532,6 +1537,9 @@ func (j Job) CancelReason() string {
1532 if j.Reason == ReasonSuperseded {
1537 if j.Reason == ReasonSuperseded {
1533 return "superseded"
1538 return "superseded"
1534 }
1539 }
1540 if j.Reason == ReasonStaleManual {
1541 return "stale"
1542 }
1535 return "manual"
1543 return "manual"
1536}
1544}
1537
1545
internal/store/stale_manual.go added +258 −0
@@ -0,0 +1,258 @@
1 package store
2
3 import (
4 "context"
5 "database/sql"
6 "errors"
7 "strconv"
8 "time"
9 )
10
11 // Verlopen handmatige jobs (stale manual).
12 //
13 // Een handmatige job (status manual) verloopt als zijn pipeline stale is:
14 // - superseded: er is een nieuwere pipeline op dezelfde ref (en hetzelfde
15 // merge request) in dezelfde repository. Een pipeline die alleen een
16 // kapotte blue-ci-cd.yml meldt, telt niet als nieuwere pipeline.
17 // - leeftijd: de pipeline wacht alleen nog op handmatige jobs (status
18 // manual) en is ouder dan N dagen. N is een instance-instelling
19 // (standaard 7) die per repository overschreven kan worden; 0 = uit.
20 //
21 // Verlopen is niet destructief: de job gaat naar canceled met een reden en een
22 // logregel; logs en artifacts blijven staan. Jobs die alleen nog op de
23 // verlopen job wachtten (needs), verlopen mee. Niet-handmatige jobs die nog
24 // lopen of in de wachtrij staan, blijven ongemoeid.
25
26 // DefaultStaleManualDays is de standaard voor de leeftijdsregel.
27 const DefaultStaleManualDays = 7
28
29 const staleManualKey = "stale_manual_days"
30
31 // StaleManualDays geeft de instance-instelling (dagen, 0 = uit).
32 func (s *Store) StaleManualDays(ctx context.Context) (int, error) {
33 var v string
34 err := s.db.QueryRowContext(ctx, `SELECT value FROM instance_settings WHERE key = ?`, staleManualKey).Scan(&v)
35 if errors.Is(err, sql.ErrNoRows) {
36 return DefaultStaleManualDays, nil
37 }
38 if err != nil {
39 return 0, err
40 }
41 n, err := strconv.Atoi(v)
42 if err != nil || n < 0 {
43 return DefaultStaleManualDays, nil
44 }
45 return n, nil
46 }
47
48 // SetStaleManualDays zet de instance-instelling (0 = uit, max 3650).
49 func (s *Store) SetStaleManualDays(ctx context.Context, days int) error {
50 if days < 0 || days > 3650 {
51 return errors.New("stale manual days out of range")
52 }
53 _, err := s.db.ExecContext(ctx, `INSERT INTO instance_settings (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value`, staleManualKey, strconv.Itoa(days))
54 return err
55 }
56
57 // RepoStaleManualDays geeft de eigen instelling van een repository;
58 // -1 = de instance-instelling volgen.
59 func (s *Store) RepoStaleManualDays(ctx context.Context, repoID int64) (int, error) {
60 var n int
61 err := s.db.QueryRowContext(ctx, `SELECT stale_manual_days FROM repos WHERE id = ?`, repoID).Scan(&n)
62 return n, err
63 }
64
65 // SetRepoStaleManualDays zet de eigen instelling (-1 = volgen, 0 = uit).
66 func (s *Store) SetRepoStaleManualDays(ctx context.Context, repoID int64, days int) error {
67 if days < -1 || days > 3650 {
68 return errors.New("stale manual days out of range")
69 }
70 _, err := s.db.ExecContext(ctx, `UPDATE repos SET stale_manual_days = ? WHERE id = ?`, days, repoID)
71 return err
72 }
73
74 // ExpiredManual is één pipeline waarvan handmatige jobs verlopen zijn.
75 type ExpiredManual struct {
76 RepoID int64
77 PipelineID int64
78 Ref string
79 Jobs int
80 Reason string // superseded of stale
81 }
82
83 // expirePipelineManual laat de handmatige jobs van één pipeline verlopen
84 // (en de jobs die alleen daarop wachten) en werkt de pipelinestatus bij.
85 func (s *Store) expirePipelineManual(ctx context.Context, pipelineID int64, reason, note string) (int, error) {
86 jobs, err := s.JobsByPipeline(ctx, pipelineID)
87 if err != nil {
88 return 0, err
89 }
90 blocked := manualBlocked(jobs)
91 line := time.Now().UTC().Format(time.RFC3339) + "\t" + note + "\n"
92 n := 0
93 for i, j := range jobs {
94 if j.Status != "manual" && !(j.Status == "queued" && blocked[i]) {
95 continue
96 }
97 res, err := s.db.ExecContext(ctx, `UPDATE jobs SET status = 'canceled', failure_reason = ?, log = log || ?, finished_at = ? WHERE id = ? AND status = ?`, reason, line, now(), j.ID, j.Status)
98 if err != nil {
99 return n, err
100 }
101 if c, _ := res.RowsAffected(); c == 1 {
102 n++
103 }
104 }
105 if n > 0 {
106 if _, err := s.RefreshPipelineStatus(ctx, pipelineID); err != nil {
107 return n, err
108 }
109 }
110 return n, nil
111 }
112
113 const noteSuperseded = "manual job expired (obsolete): a newer pipeline exists for the same ref"
114
115 func noteStale(days int) string {
116 return "manual job expired (obsolete): the pipeline waited only for manual action for more than " + strconv.Itoa(days) + " days"
117 }
118
119 // configFailureSQL herkent een pipeline die alleen een kapotte config meldt.
120 const configFailureSQL = `EXISTS (SELECT 1 FROM jobs cj WHERE cj.pipeline_id = n.id AND cj.name = 'blue-ci-cd' AND cj.script = 'exit 1' AND cj.image = 'alpine:3.20' AND cj.position = 0)
121 AND (SELECT COUNT(*) FROM jobs cj WHERE cj.pipeline_id = n.id) = 1`
122
123 // ExpireSupersededManual laat handmatige jobs verlopen in pipelines op
124 // dezelfde ref (en hetzelfde MR) die ouder zijn dan keep.
125 func (s *Store) ExpireSupersededManual(ctx context.Context, repoID int64, ref string, keep int64) ([]ExpiredManual, error) {
126 rows, err := s.db.QueryContext(ctx, `SELECT DISTINCT p.id, p.ref FROM pipelines p JOIN jobs j ON j.pipeline_id = p.id
127 JOIN pipelines n ON n.id = ?
128 WHERE p.repo_id = ? AND p.ref = ? AND p.id < n.id AND p.mr_id = n.mr_id AND j.status = 'manual'
129 AND NOT (`+configFailureSQL+`)`, keep, repoID, ref)
130 if err != nil {
131 return nil, err
132 }
133 return s.expireRows(ctx, rows, repoID, "superseded", ReasonSuperseded, noteSuperseded)
134 }
135
136 func (s *Store) expireRows(ctx context.Context, rows *sql.Rows, repoID int64, kind, reason, note string) ([]ExpiredManual, error) {
137 type item struct {
138 id int64
139 ref string
140 }
141 var items []item
142 for rows.Next() {
143 var it item
144 if err := rows.Scan(&it.id, &it.ref); err != nil {
145 rows.Close()
146 return nil, err
147 }
148 items = append(items, it)
149 }
150 err := rows.Err()
151 rows.Close()
152 if err != nil {
153 return nil, err
154 }
155 var out []ExpiredManual
156 for _, it := range items {
157 n, err := s.expirePipelineManual(ctx, it.id, reason, note)
158 if err != nil {
159 return out, err
160 }
161 if n > 0 {
162 out = append(out, ExpiredManual{RepoID: repoID, PipelineID: it.id, Ref: it.ref, Jobs: n, Reason: kind})
163 }
164 }
165 return out, nil
166 }
167
168 // SweepStaleManual loopt alle repositories langs: eerst superseded
169 // (voor oude pipelines van vóór deze functie), dan de leeftijdsregel.
170 func (s *Store) SweepStaleManual(ctx context.Context, at time.Time) ([]ExpiredManual, error) {
171 def, err := s.StaleManualDays(ctx)
172 if err != nil {
173 return nil, err
174 }
175 // Superseded: pipelines met een handmatige job en een nieuwere pipeline
176 // op dezelfde ref en hetzelfde MR.
177 rows, err := s.db.QueryContext(ctx, `SELECT DISTINCT p.repo_id, p.id, p.ref FROM pipelines p JOIN jobs j ON j.pipeline_id = p.id
178 WHERE j.status = 'manual' AND EXISTS (
179 SELECT 1 FROM pipelines n WHERE n.repo_id = p.repo_id AND n.ref = p.ref AND n.mr_id = p.mr_id AND n.id > p.id
180 AND NOT (`+configFailureSQL+`))
181 ORDER BY p.id`)
182 if err != nil {
183 return nil, err
184 }
185 type item struct {
186 repo, id int64
187 ref string
188 }
189 var sup []item
190 for rows.Next() {
191 var it item
192 if err := rows.Scan(&it.repo, &it.id, &it.ref); err != nil {
193 rows.Close()
194 return nil, err
195 }
196 sup = append(sup, it)
197 }
198 err = rows.Err()
199 rows.Close()
200 if err != nil {
201 return nil, err
202 }
203 var out []ExpiredManual
204 for _, it := range sup {
205 n, err := s.expirePipelineManual(ctx, it.id, ReasonSuperseded, noteSuperseded)
206 if err != nil {
207 return out, err
208 }
209 if n > 0 {
210 out = append(out, ExpiredManual{RepoID: it.repo, PipelineID: it.id, Ref: it.ref, Jobs: n, Reason: "superseded"})
211 }
212 }
213 // Leeftijd: pipelines die alleen nog op handmatige actie wachten.
214 rows, err = s.db.QueryContext(ctx, `SELECT p.repo_id, p.id, p.ref, p.created_at, r.stale_manual_days FROM pipelines p JOIN repos r ON r.id = p.repo_id WHERE p.status = 'manual' ORDER BY p.id`)
215 if err != nil {
216 return out, err
217 }
218 type aged struct {
219 item
220 days int
221 }
222 var old []aged
223 for rows.Next() {
224 var it item
225 var created string
226 var days int
227 if err := rows.Scan(&it.repo, &it.id, &it.ref, &created, &days); err != nil {
228 rows.Close()
229 return out, err
230 }
231 if days < 0 {
232 days = def
233 }
234 if days == 0 {
235 continue
236 }
237 t := parseTime(created)
238 if t.IsZero() || at.Sub(t) < time.Duration(days)*24*time.Hour {
239 continue
240 }
241 old = append(old, aged{it, days})
242 }
243 err = rows.Err()
244 rows.Close()
245 if err != nil {
246 return out, err
247 }
248 for _, it := range old {
249 n, err := s.expirePipelineManual(ctx, it.id, ReasonStaleManual, noteStale(it.days))
250 if err != nil {
251 return out, err
252 }
253 if n > 0 {
254 out = append(out, ExpiredManual{RepoID: it.repo, PipelineID: it.id, Ref: it.ref, Jobs: n, Reason: "stale"})
255 }
256 }
257 return out, nil
258 }
@@ -0,0 +1,258 @@
1package store
2
3import (
4 "context"
5 "database/sql"
6 "errors"
7 "strconv"
8 "time"
9)
10
11// Verlopen handmatige jobs (stale manual).
12//
13// Een handmatige job (status manual) verloopt als zijn pipeline stale is:
14// - superseded: er is een nieuwere pipeline op dezelfde ref (en hetzelfde
15// merge request) in dezelfde repository. Een pipeline die alleen een
16// kapotte blue-ci-cd.yml meldt, telt niet als nieuwere pipeline.
17// - leeftijd: de pipeline wacht alleen nog op handmatige jobs (status
18// manual) en is ouder dan N dagen. N is een instance-instelling
19// (standaard 7) die per repository overschreven kan worden; 0 = uit.
20//
21// Verlopen is niet destructief: de job gaat naar canceled met een reden en een
22// logregel; logs en artifacts blijven staan. Jobs die alleen nog op de
23// verlopen job wachtten (needs), verlopen mee. Niet-handmatige jobs die nog
24// lopen of in de wachtrij staan, blijven ongemoeid.
25
26// DefaultStaleManualDays is de standaard voor de leeftijdsregel.
27const DefaultStaleManualDays = 7
28
29const staleManualKey = "stale_manual_days"
30
31// StaleManualDays geeft de instance-instelling (dagen, 0 = uit).
32func (s *Store) StaleManualDays(ctx context.Context) (int, error) {
33 var v string
34 err := s.db.QueryRowContext(ctx, `SELECT value FROM instance_settings WHERE key = ?`, staleManualKey).Scan(&v)
35 if errors.Is(err, sql.ErrNoRows) {
36 return DefaultStaleManualDays, nil
37 }
38 if err != nil {
39 return 0, err
40 }
41 n, err := strconv.Atoi(v)
42 if err != nil || n < 0 {
43 return DefaultStaleManualDays, nil
44 }
45 return n, nil
46}
47
48// SetStaleManualDays zet de instance-instelling (0 = uit, max 3650).
49func (s *Store) SetStaleManualDays(ctx context.Context, days int) error {
50 if days < 0 || days > 3650 {
51 return errors.New("stale manual days out of range")
52 }
53 _, err := s.db.ExecContext(ctx, `INSERT INTO instance_settings (key, value) VALUES (?, ?) ON CONFLICT(key) DO UPDATE SET value = excluded.value`, staleManualKey, strconv.Itoa(days))
54 return err
55}
56
57// RepoStaleManualDays geeft de eigen instelling van een repository;
58// -1 = de instance-instelling volgen.
59func (s *Store) RepoStaleManualDays(ctx context.Context, repoID int64) (int, error) {
60 var n int
61 err := s.db.QueryRowContext(ctx, `SELECT stale_manual_days FROM repos WHERE id = ?`, repoID).Scan(&n)
62 return n, err
63}
64
65// SetRepoStaleManualDays zet de eigen instelling (-1 = volgen, 0 = uit).
66func (s *Store) SetRepoStaleManualDays(ctx context.Context, repoID int64, days int) error {
67 if days < -1 || days > 3650 {
68 return errors.New("stale manual days out of range")
69 }
70 _, err := s.db.ExecContext(ctx, `UPDATE repos SET stale_manual_days = ? WHERE id = ?`, days, repoID)
71 return err
72}
73
74// ExpiredManual is één pipeline waarvan handmatige jobs verlopen zijn.
75type ExpiredManual struct {
76 RepoID int64
77 PipelineID int64
78 Ref string
79 Jobs int
80 Reason string // superseded of stale
81}
82
83// expirePipelineManual laat de handmatige jobs van één pipeline verlopen
84// (en de jobs die alleen daarop wachten) en werkt de pipelinestatus bij.
85func (s *Store) expirePipelineManual(ctx context.Context, pipelineID int64, reason, note string) (int, error) {
86 jobs, err := s.JobsByPipeline(ctx, pipelineID)
87 if err != nil {
88 return 0, err
89 }
90 blocked := manualBlocked(jobs)
91 line := time.Now().UTC().Format(time.RFC3339) + "\t" + note + "\n"
92 n := 0
93 for i, j := range jobs {
94 if j.Status != "manual" && !(j.Status == "queued" && blocked[i]) {
95 continue
96 }
97 res, err := s.db.ExecContext(ctx, `UPDATE jobs SET status = 'canceled', failure_reason = ?, log = log || ?, finished_at = ? WHERE id = ? AND status = ?`, reason, line, now(), j.ID, j.Status)
98 if err != nil {
99 return n, err
100 }
101 if c, _ := res.RowsAffected(); c == 1 {
102 n++
103 }
104 }
105 if n > 0 {
106 if _, err := s.RefreshPipelineStatus(ctx, pipelineID); err != nil {
107 return n, err
108 }
109 }
110 return n, nil
111}
112
113const noteSuperseded = "manual job expired (obsolete): a newer pipeline exists for the same ref"
114
115func noteStale(days int) string {
116 return "manual job expired (obsolete): the pipeline waited only for manual action for more than " + strconv.Itoa(days) + " days"
117}
118
119// configFailureSQL herkent een pipeline die alleen een kapotte config meldt.
120const configFailureSQL = `EXISTS (SELECT 1 FROM jobs cj WHERE cj.pipeline_id = n.id AND cj.name = 'blue-ci-cd' AND cj.script = 'exit 1' AND cj.image = 'alpine:3.20' AND cj.position = 0)
121 AND (SELECT COUNT(*) FROM jobs cj WHERE cj.pipeline_id = n.id) = 1`
122
123// ExpireSupersededManual laat handmatige jobs verlopen in pipelines op
124// dezelfde ref (en hetzelfde MR) die ouder zijn dan keep.
125func (s *Store) ExpireSupersededManual(ctx context.Context, repoID int64, ref string, keep int64) ([]ExpiredManual, error) {
126 rows, err := s.db.QueryContext(ctx, `SELECT DISTINCT p.id, p.ref FROM pipelines p JOIN jobs j ON j.pipeline_id = p.id
127 JOIN pipelines n ON n.id = ?
128 WHERE p.repo_id = ? AND p.ref = ? AND p.id < n.id AND p.mr_id = n.mr_id AND j.status = 'manual'
129 AND NOT (`+configFailureSQL+`)`, keep, repoID, ref)
130 if err != nil {
131 return nil, err
132 }
133 return s.expireRows(ctx, rows, repoID, "superseded", ReasonSuperseded, noteSuperseded)
134}
135
136func (s *Store) expireRows(ctx context.Context, rows *sql.Rows, repoID int64, kind, reason, note string) ([]ExpiredManual, error) {
137 type item struct {
138 id int64
139 ref string
140 }
141 var items []item
142 for rows.Next() {
143 var it item
144 if err := rows.Scan(&it.id, &it.ref); err != nil {
145 rows.Close()
146 return nil, err
147 }
148 items = append(items, it)
149 }
150 err := rows.Err()
151 rows.Close()
152 if err != nil {
153 return nil, err
154 }
155 var out []ExpiredManual
156 for _, it := range items {
157 n, err := s.expirePipelineManual(ctx, it.id, reason, note)
158 if err != nil {
159 return out, err
160 }
161 if n > 0 {
162 out = append(out, ExpiredManual{RepoID: repoID, PipelineID: it.id, Ref: it.ref, Jobs: n, Reason: kind})
163 }
164 }
165 return out, nil
166}
167
168// SweepStaleManual loopt alle repositories langs: eerst superseded
169// (voor oude pipelines van vóór deze functie), dan de leeftijdsregel.
170func (s *Store) SweepStaleManual(ctx context.Context, at time.Time) ([]ExpiredManual, error) {
171 def, err := s.StaleManualDays(ctx)
172 if err != nil {
173 return nil, err
174 }
175 // Superseded: pipelines met een handmatige job en een nieuwere pipeline
176 // op dezelfde ref en hetzelfde MR.
177 rows, err := s.db.QueryContext(ctx, `SELECT DISTINCT p.repo_id, p.id, p.ref FROM pipelines p JOIN jobs j ON j.pipeline_id = p.id
178 WHERE j.status = 'manual' AND EXISTS (
179 SELECT 1 FROM pipelines n WHERE n.repo_id = p.repo_id AND n.ref = p.ref AND n.mr_id = p.mr_id AND n.id > p.id
180 AND NOT (`+configFailureSQL+`))
181 ORDER BY p.id`)
182 if err != nil {
183 return nil, err
184 }
185 type item struct {
186 repo, id int64
187 ref string
188 }
189 var sup []item
190 for rows.Next() {
191 var it item
192 if err := rows.Scan(&it.repo, &it.id, &it.ref); err != nil {
193 rows.Close()
194 return nil, err
195 }
196 sup = append(sup, it)
197 }
198 err = rows.Err()
199 rows.Close()
200 if err != nil {
201 return nil, err
202 }
203 var out []ExpiredManual
204 for _, it := range sup {
205 n, err := s.expirePipelineManual(ctx, it.id, ReasonSuperseded, noteSuperseded)
206 if err != nil {
207 return out, err
208 }
209 if n > 0 {
210 out = append(out, ExpiredManual{RepoID: it.repo, PipelineID: it.id, Ref: it.ref, Jobs: n, Reason: "superseded"})
211 }
212 }
213 // Leeftijd: pipelines die alleen nog op handmatige actie wachten.
214 rows, err = s.db.QueryContext(ctx, `SELECT p.repo_id, p.id, p.ref, p.created_at, r.stale_manual_days FROM pipelines p JOIN repos r ON r.id = p.repo_id WHERE p.status = 'manual' ORDER BY p.id`)
215 if err != nil {
216 return out, err
217 }
218 type aged struct {
219 item
220 days int
221 }
222 var old []aged
223 for rows.Next() {
224 var it item
225 var created string
226 var days int
227 if err := rows.Scan(&it.repo, &it.id, &it.ref, &created, &days); err != nil {
228 rows.Close()
229 return out, err
230 }
231 if days < 0 {
232 days = def
233 }
234 if days == 0 {
235 continue
236 }
237 t := parseTime(created)
238 if t.IsZero() || at.Sub(t) < time.Duration(days)*24*time.Hour {
239 continue
240 }
241 old = append(old, aged{it, days})
242 }
243 err = rows.Err()
244 rows.Close()
245 if err != nil {
246 return out, err
247 }
248 for _, it := range old {
249 n, err := s.expirePipelineManual(ctx, it.id, ReasonStaleManual, noteStale(it.days))
250 if err != nil {
251 return out, err
252 }
253 if n > 0 {
254 out = append(out, ExpiredManual{RepoID: it.repo, PipelineID: it.id, Ref: it.ref, Jobs: n, Reason: "stale"})
255 }
256 }
257 return out, nil
258}
internal/store/stale_manual_test.go added +192 −0
@@ -0,0 +1,192 @@
1 package store
2
3 import (
4 "context"
5 "testing"
6 "time"
7 )
8
9 func staleSetup(t *testing.T) (*Store, int64) {
10 t.Helper()
11 s := openTest(t)
12 ctx := context.Background()
13 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
14 if err != nil {
15 t.Fatal(err)
16 }
17 repo, err := s.CreateRepo(ctx, "user", tim.ID, "pp", "", "master", "private")
18 if err != nil {
19 t.Fatal(err)
20 }
21 return s, repo.ID
22 }
23
24 func relPipeline(t *testing.T, s *Store, repoID int64, sha, ref string) (int64, map[string]Job) {
25 t.Helper()
26 ctx := context.Background()
27 id, err := s.CreatePipeline(ctx, repoID, sha, ref, "push", "tim", "rel", []NewJob{
28 {Name: "build", Stage: "build", Script: "true"},
29 {Name: "release", Stage: "release", Script: "true", When: "manual"},
30 {Name: "publish", Stage: "publish", Script: "true", Needs: []string{"release"}, NeedsSet: true},
31 })
32 if err != nil {
33 t.Fatal(err)
34 }
35 return id, staleJobs(t, s, id)
36 }
37
38 func staleJobs(t *testing.T, s *Store, id int64) map[string]Job {
39 jobs, _ := s.JobsByPipeline(context.Background(), id)
40 m := map[string]Job{}
41 for _, j := range jobs {
42 m[j.Name] = j
43 }
44 return m
45 }
46
47 func TestStaleManualSuperseded(t *testing.T) {
48 s, repo := staleSetup(t)
49 ctx := context.Background()
50 old, oj := relPipeline(t, s, repo, "a1", "refs/heads/master")
51 _ = s.FinishJob(ctx, oj["build"].ID, "success", "")
52 _, _ = s.RefreshPipelineStatus(ctx, old)
53 // Andere ref blijft ongemoeid.
54 other, _ := relPipeline(t, s, repo, "b1", "refs/heads/stage")
55 // Nieuwere pipeline op master: build loopt nog.
56 nw, _ := relPipeline(t, s, repo, "a2", "refs/heads/master")
57 out, err := s.ExpireSupersededManual(ctx, repo, "refs/heads/master", nw)
58 if err != nil || len(out) != 1 || out[0].PipelineID != old || out[0].Jobs != 2 {
59 t.Fatalf("out %+v %v", out, err)
60 }
61 j := staleJobs(t, s, old)
62 if j["release"].Status != "canceled" || !j["release"].Obsolete() || j["release"].CancelReason() != "superseded" {
63 t.Fatalf("release %+v", j["release"])
64 }
65 if j["publish"].Status != "canceled" || j["build"].Status != "success" {
66 t.Fatalf("publish %s build %s", j["publish"].Status, j["build"].Status)
67 }
68 p, _ := s.PipelineByID(ctx, repo, old)
69 if p.Status != "canceled" || !PipelineObsolete(func() []Job { js, _ := s.JobsByPipeline(ctx, old); return js }()) {
70 t.Fatalf("pipeline %s", p.Status)
71 }
72 // Nieuwste blijft startbaar, andere ref ook.
73 if staleJobs(t, s, nw)["release"].Status != "manual" || staleJobs(t, s, other)["release"].Status != "manual" {
74 t.Fatal("nieuwste of andere ref verlopen")
75 }
76 if ok, _ := s.QueueJob(ctx, staleJobs(t, s, nw)["release"].ID); !ok {
77 t.Fatal("nieuwste niet startbaar")
78 }
79 // Verlopen job kan niet via QueueJob (status canceled).
80 if ok, _ := s.QueueJob(ctx, j["release"].ID); ok {
81 t.Fatal("verlopen job startte")
82 }
83 }
84
85 func TestStaleManualRunningJobsStay(t *testing.T) {
86 s, repo := staleSetup(t)
87 ctx := context.Background()
88 old, oj := relPipeline(t, s, repo, "a1", "refs/heads/master")
89 // build staat nog in de wachtrij: alleen manual (en wat daarop wacht) verloopt.
90 nw, _ := relPipeline(t, s, repo, "a2", "refs/heads/master")
91 if _, err := s.ExpireSupersededManual(ctx, repo, "refs/heads/master", nw); err != nil {
92 t.Fatal(err)
93 }
94 j := staleJobs(t, s, old)
95 if j["build"].Status != oj["build"].Status || j["release"].Status != "canceled" {
96 t.Fatalf("build %s release %s", j["build"].Status, j["release"].Status)
97 }
98 if st, _ := s.RefreshPipelineStatus(ctx, old); st != "running" {
99 t.Fatalf("pipeline met open build: %s", st)
100 }
101 }
102
103 func TestStaleManualConfigFailureDoesNotSupersede(t *testing.T) {
104 s, repo := staleSetup(t)
105 ctx := context.Background()
106 old, _ := relPipeline(t, s, repo, "a1", "refs/heads/master")
107 if _, _, err := s.RecordConfigFailure(ctx, repo, "a2", "refs/heads/master", "push", "kapot", 0, ""); err != nil {
108 t.Fatal(err)
109 }
110 out, err := s.SweepStaleManual(ctx, time.Now())
111 if err != nil || len(out) != 0 || staleJobs(t, s, old)["release"].Status != "manual" {
112 t.Fatalf("%+v %v", out, err)
113 }
114 }
115
116 func TestStaleManualAge(t *testing.T) {
117 s, repo := staleSetup(t)
118 ctx := context.Background()
119 id, j := relPipeline(t, s, repo, "a1", "refs/heads/master")
120 _ = s.FinishJob(ctx, j["build"].ID, "success", "")
121 if st, _ := s.RefreshPipelineStatus(ctx, id); st != "manual" {
122 t.Fatalf("opzet %s", st)
123 }
124 if d, _ := s.StaleManualDays(ctx); d != 7 {
125 t.Fatalf("standaard %d", d)
126 }
127 // 6 dagen: nog niet.
128 out, _ := s.SweepStaleManual(ctx, time.Now().Add(6*24*time.Hour))
129 if len(out) != 0 {
130 t.Fatalf("te vroeg: %+v", out)
131 }
132 // Instance 0 = uit.
133 _ = s.SetStaleManualDays(ctx, 0)
134 if out, _ := s.SweepStaleManual(ctx, time.Now().Add(30*24*time.Hour)); len(out) != 0 {
135 t.Fatalf("0 = uit: %+v", out)
136 }
137 // Project overschrijft: 2 dagen.
138 _ = s.SetRepoStaleManualDays(ctx, repo, 2)
139 out, err := s.SweepStaleManual(ctx, time.Now().Add(3*24*time.Hour))
140 if err != nil || len(out) != 1 || out[0].Reason != "stale" || out[0].Jobs != 2 {
141 t.Fatalf("%+v %v", out, err)
142 }
143 jj := staleJobs(t, s, id)
144 if jj["release"].CancelReason() != "stale" || !jj["release"].Obsolete() {
145 t.Fatalf("%+v", jj["release"])
146 }
147 p, _ := s.PipelineByID(ctx, repo, id)
148 if p.Status != "canceled" {
149 t.Fatalf("pipeline %s", p.Status)
150 }
151 // Tweede keer: niets meer.
152 if out, _ := s.SweepStaleManual(ctx, time.Now().Add(3*24*time.Hour)); len(out) != 0 {
153 t.Fatalf("dubbel: %+v", out)
154 }
155 }
156
157 func TestStaleManualRepoZeroOverridesInstance(t *testing.T) {
158 s, repo := staleSetup(t)
159 ctx := context.Background()
160 id, j := relPipeline(t, s, repo, "a1", "refs/heads/master")
161 _ = s.FinishJob(ctx, j["build"].ID, "success", "")
162 _, _ = s.RefreshPipelineStatus(ctx, id)
163 _ = s.SetRepoStaleManualDays(ctx, repo, 0)
164 if out, _ := s.SweepStaleManual(ctx, time.Now().Add(100*24*time.Hour)); len(out) != 0 {
165 t.Fatalf("project 0 = uit: %+v", out)
166 }
167 if err := s.SetStaleManualDays(ctx, -3); err == nil {
168 t.Fatal("negatief toegestaan")
169 }
170 }
171
172 func TestStaleManualAllowFailureSuccess(t *testing.T) {
173 s, repo := staleSetup(t)
174 ctx := context.Background()
175 id, err := s.CreatePipeline(ctx, repo, "a1", "refs/heads/master", "push", "tim", "x", []NewJob{
176 {Name: "build", Stage: "build", Script: "true"},
177 {Name: "deploy", Stage: "deploy", Script: "true", When: "manual", AllowFailure: true},
178 })
179 if err != nil {
180 t.Fatal(err)
181 }
182 _ = s.FinishJob(ctx, staleJobs(t, s, id)["build"].ID, "success", "")
183 _, _ = s.RefreshPipelineStatus(ctx, id)
184 nw, _ := relPipeline(t, s, repo, "a2", "refs/heads/master")
185 if _, err := s.ExpireSupersededManual(ctx, repo, "refs/heads/master", nw); err != nil {
186 t.Fatal(err)
187 }
188 p, _ := s.PipelineByID(ctx, repo, id)
189 if p.Status != "success" {
190 t.Fatalf("allow_failure manual verlopen: %s", p.Status)
191 }
192 }
@@ -0,0 +1,192 @@
1package store
2
3import (
4 "context"
5 "testing"
6 "time"
7)
8
9func staleSetup(t *testing.T) (*Store, int64) {
10 t.Helper()
11 s := openTest(t)
12 ctx := context.Background()
13 tim, err := s.UpsertUser(ctx, 1, "tim", "", false)
14 if err != nil {
15 t.Fatal(err)
16 }
17 repo, err := s.CreateRepo(ctx, "user", tim.ID, "pp", "", "master", "private")
18 if err != nil {
19 t.Fatal(err)
20 }
21 return s, repo.ID
22}
23
24func relPipeline(t *testing.T, s *Store, repoID int64, sha, ref string) (int64, map[string]Job) {
25 t.Helper()
26 ctx := context.Background()
27 id, err := s.CreatePipeline(ctx, repoID, sha, ref, "push", "tim", "rel", []NewJob{
28 {Name: "build", Stage: "build", Script: "true"},
29 {Name: "release", Stage: "release", Script: "true", When: "manual"},
30 {Name: "publish", Stage: "publish", Script: "true", Needs: []string{"release"}, NeedsSet: true},
31 })
32 if err != nil {
33 t.Fatal(err)
34 }
35 return id, staleJobs(t, s, id)
36}
37
38func staleJobs(t *testing.T, s *Store, id int64) map[string]Job {
39 jobs, _ := s.JobsByPipeline(context.Background(), id)
40 m := map[string]Job{}
41 for _, j := range jobs {
42 m[j.Name] = j
43 }
44 return m
45}
46
47func TestStaleManualSuperseded(t *testing.T) {
48 s, repo := staleSetup(t)
49 ctx := context.Background()
50 old, oj := relPipeline(t, s, repo, "a1", "refs/heads/master")
51 _ = s.FinishJob(ctx, oj["build"].ID, "success", "")
52 _, _ = s.RefreshPipelineStatus(ctx, old)
53 // Andere ref blijft ongemoeid.
54 other, _ := relPipeline(t, s, repo, "b1", "refs/heads/stage")
55 // Nieuwere pipeline op master: build loopt nog.
56 nw, _ := relPipeline(t, s, repo, "a2", "refs/heads/master")
57 out, err := s.ExpireSupersededManual(ctx, repo, "refs/heads/master", nw)
58 if err != nil || len(out) != 1 || out[0].PipelineID != old || out[0].Jobs != 2 {
59 t.Fatalf("out %+v %v", out, err)
60 }
61 j := staleJobs(t, s, old)
62 if j["release"].Status != "canceled" || !j["release"].Obsolete() || j["release"].CancelReason() != "superseded" {
63 t.Fatalf("release %+v", j["release"])
64 }
65 if j["publish"].Status != "canceled" || j["build"].Status != "success" {
66 t.Fatalf("publish %s build %s", j["publish"].Status, j["build"].Status)
67 }
68 p, _ := s.PipelineByID(ctx, repo, old)
69 if p.Status != "canceled" || !PipelineObsolete(func() []Job { js, _ := s.JobsByPipeline(ctx, old); return js }()) {
70 t.Fatalf("pipeline %s", p.Status)
71 }
72 // Nieuwste blijft startbaar, andere ref ook.
73 if staleJobs(t, s, nw)["release"].Status != "manual" || staleJobs(t, s, other)["release"].Status != "manual" {
74 t.Fatal("nieuwste of andere ref verlopen")
75 }
76 if ok, _ := s.QueueJob(ctx, staleJobs(t, s, nw)["release"].ID); !ok {
77 t.Fatal("nieuwste niet startbaar")
78 }
79 // Verlopen job kan niet via QueueJob (status canceled).
80 if ok, _ := s.QueueJob(ctx, j["release"].ID); ok {
81 t.Fatal("verlopen job startte")
82 }
83}
84
85func TestStaleManualRunningJobsStay(t *testing.T) {
86 s, repo := staleSetup(t)
87 ctx := context.Background()
88 old, oj := relPipeline(t, s, repo, "a1", "refs/heads/master")
89 // build staat nog in de wachtrij: alleen manual (en wat daarop wacht) verloopt.
90 nw, _ := relPipeline(t, s, repo, "a2", "refs/heads/master")
91 if _, err := s.ExpireSupersededManual(ctx, repo, "refs/heads/master", nw); err != nil {
92 t.Fatal(err)
93 }
94 j := staleJobs(t, s, old)
95 if j["build"].Status != oj["build"].Status || j["release"].Status != "canceled" {
96 t.Fatalf("build %s release %s", j["build"].Status, j["release"].Status)
97 }
98 if st, _ := s.RefreshPipelineStatus(ctx, old); st != "running" {
99 t.Fatalf("pipeline met open build: %s", st)
100 }
101}
102
103func TestStaleManualConfigFailureDoesNotSupersede(t *testing.T) {
104 s, repo := staleSetup(t)
105 ctx := context.Background()
106 old, _ := relPipeline(t, s, repo, "a1", "refs/heads/master")
107 if _, _, err := s.RecordConfigFailure(ctx, repo, "a2", "refs/heads/master", "push", "kapot", 0, ""); err != nil {
108 t.Fatal(err)
109 }
110 out, err := s.SweepStaleManual(ctx, time.Now())
111 if err != nil || len(out) != 0 || staleJobs(t, s, old)["release"].Status != "manual" {
112 t.Fatalf("%+v %v", out, err)
113 }
114}
115
116func TestStaleManualAge(t *testing.T) {
117 s, repo := staleSetup(t)
118 ctx := context.Background()
119 id, j := relPipeline(t, s, repo, "a1", "refs/heads/master")
120 _ = s.FinishJob(ctx, j["build"].ID, "success", "")
121 if st, _ := s.RefreshPipelineStatus(ctx, id); st != "manual" {
122 t.Fatalf("opzet %s", st)
123 }
124 if d, _ := s.StaleManualDays(ctx); d != 7 {
125 t.Fatalf("standaard %d", d)
126 }
127 // 6 dagen: nog niet.
128 out, _ := s.SweepStaleManual(ctx, time.Now().Add(6*24*time.Hour))
129 if len(out) != 0 {
130 t.Fatalf("te vroeg: %+v", out)
131 }
132 // Instance 0 = uit.
133 _ = s.SetStaleManualDays(ctx, 0)
134 if out, _ := s.SweepStaleManual(ctx, time.Now().Add(30*24*time.Hour)); len(out) != 0 {
135 t.Fatalf("0 = uit: %+v", out)
136 }
137 // Project overschrijft: 2 dagen.
138 _ = s.SetRepoStaleManualDays(ctx, repo, 2)
139 out, err := s.SweepStaleManual(ctx, time.Now().Add(3*24*time.Hour))
140 if err != nil || len(out) != 1 || out[0].Reason != "stale" || out[0].Jobs != 2 {
141 t.Fatalf("%+v %v", out, err)
142 }
143 jj := staleJobs(t, s, id)
144 if jj["release"].CancelReason() != "stale" || !jj["release"].Obsolete() {
145 t.Fatalf("%+v", jj["release"])
146 }
147 p, _ := s.PipelineByID(ctx, repo, id)
148 if p.Status != "canceled" {
149 t.Fatalf("pipeline %s", p.Status)
150 }
151 // Tweede keer: niets meer.
152 if out, _ := s.SweepStaleManual(ctx, time.Now().Add(3*24*time.Hour)); len(out) != 0 {
153 t.Fatalf("dubbel: %+v", out)
154 }
155}
156
157func TestStaleManualRepoZeroOverridesInstance(t *testing.T) {
158 s, repo := staleSetup(t)
159 ctx := context.Background()
160 id, j := relPipeline(t, s, repo, "a1", "refs/heads/master")
161 _ = s.FinishJob(ctx, j["build"].ID, "success", "")
162 _, _ = s.RefreshPipelineStatus(ctx, id)
163 _ = s.SetRepoStaleManualDays(ctx, repo, 0)
164 if out, _ := s.SweepStaleManual(ctx, time.Now().Add(100*24*time.Hour)); len(out) != 0 {
165 t.Fatalf("project 0 = uit: %+v", out)
166 }
167 if err := s.SetStaleManualDays(ctx, -3); err == nil {
168 t.Fatal("negatief toegestaan")
169 }
170}
171
172func TestStaleManualAllowFailureSuccess(t *testing.T) {
173 s, repo := staleSetup(t)
174 ctx := context.Background()
175 id, err := s.CreatePipeline(ctx, repo, "a1", "refs/heads/master", "push", "tim", "x", []NewJob{
176 {Name: "build", Stage: "build", Script: "true"},
177 {Name: "deploy", Stage: "deploy", Script: "true", When: "manual", AllowFailure: true},
178 })
179 if err != nil {
180 t.Fatal(err)
181 }
182 _ = s.FinishJob(ctx, staleJobs(t, s, id)["build"].ID, "success", "")
183 _, _ = s.RefreshPipelineStatus(ctx, id)
184 nw, _ := relPipeline(t, s, repo, "a2", "refs/heads/master")
185 if _, err := s.ExpireSupersededManual(ctx, repo, "refs/heads/master", nw); err != nil {
186 t.Fatal(err)
187 }
188 p, _ := s.PipelineByID(ctx, repo, id)
189 if p.Status != "success" {
190 t.Fatalf("allow_failure manual verlopen: %s", p.Status)
191 }
192}
internal/store/store.go +5 −0
@@ -66,6 +66,7 @@ func (s *Store) migrate() error {
66 66 `ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
67 67 `ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
68 68 `ALTER TABLE repos ADD COLUMN fork_of INTEGER NOT NULL DEFAULT 0`,
69 `ALTER TABLE repos ADD COLUMN stale_manual_days INTEGER NOT NULL DEFAULT -1`,
69 70 `ALTER TABLE merge_requests ADD COLUMN source_repo_id INTEGER NOT NULL DEFAULT 0`,
70 71 `ALTER TABLE merge_requests ADD COLUMN source_repo_branch TEXT NOT NULL DEFAULT ''`,
71 72 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
@@ -131,6 +132,10 @@ func (s *Store) migrate() error {
131 132 }
132 133
133 134 const schema = `
135 CREATE TABLE IF NOT EXISTS instance_settings (
136 key TEXT PRIMARY KEY,
137 value TEXT NOT NULL
138 );
134 139 CREATE TABLE IF NOT EXISTS runners (
135 140 id INTEGER PRIMARY KEY,
136 141 owner_kind TEXT NOT NULL,
@@ -66,6 +66,7 @@ func (s *Store) migrate() error {
66 `ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
66 `ALTER TABLE repos ADD COLUMN pushed_at TEXT NOT NULL DEFAULT ''`,
67 `ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
67 `ALTER TABLE secrets ADD COLUMN expand INTEGER NOT NULL DEFAULT 0`,
68 `ALTER TABLE repos ADD COLUMN fork_of INTEGER NOT NULL DEFAULT 0`,
68 `ALTER TABLE repos ADD COLUMN fork_of INTEGER NOT NULL DEFAULT 0`,
69 `ALTER TABLE repos ADD COLUMN stale_manual_days INTEGER NOT NULL DEFAULT -1`,
69 `ALTER TABLE merge_requests ADD COLUMN source_repo_id INTEGER NOT NULL DEFAULT 0`,
70 `ALTER TABLE merge_requests ADD COLUMN source_repo_id INTEGER NOT NULL DEFAULT 0`,
70 `ALTER TABLE merge_requests ADD COLUMN source_repo_branch TEXT NOT NULL DEFAULT ''`,
71 `ALTER TABLE merge_requests ADD COLUMN source_repo_branch TEXT NOT NULL DEFAULT ''`,
71 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
72 `ALTER TABLE webhooks ADD COLUMN method TEXT NOT NULL DEFAULT 'POST'`,
@@ -131,6 +132,10 @@ func (s *Store) migrate() error {
131}
132}
132
133
133const schema = `
134const schema = `
135CREATE TABLE IF NOT EXISTS instance_settings (
136 key TEXT PRIMARY KEY,
137 value TEXT NOT NULL
138);
134CREATE TABLE IF NOT EXISTS runners (
139CREATE TABLE IF NOT EXISTS runners (
135 id INTEGER PRIMARY KEY,
140 id INTEGER PRIMARY KEY,
136 owner_kind TEXT NOT NULL,
141 owner_kind TEXT NOT NULL,