fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 11:08:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci/broadcom: Move manual/nightly jobs to postmerge stage

Browse source 
Create new stages called broadcom-postmerge and freedreno-postmerge, and
move the full and manual jobs over there, to avoid entanglement with the
pre-merge jobs.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30784>
This commit is contained in:
Daniel Stone 2024-08-22 09:55:05 +01:00 • committed by Marge Bot
parent cc507536db
commit 25c70888a5
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -154,7 +154,9 @@ stages:
- nouveau - nouveau
- arm - arm
- broadcom - broadcom
- broadcom-postmerge
- freedreno - freedreno
- freedreno-postmerge
- etnaviv - etnaviv
- software-renderer - software-renderer
- layered-backends - layered-backends

8
src/broadcom/ci/gitlab-ci-inc.yml
View file

@ -40,7 +40,7 @@
when: on_success when: on_success
.vc4-manual-rules: .vc4-manual-rules:
stage: broadcom stage: broadcom-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
@ -67,7 +67,7 @@
when: on_success when: on_success
.v3d-manual-rules: .v3d-manual-rules:
stage: broadcom stage: broadcom-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
@ -85,7 +85,7 @@
- !reference [.rusticl-rules, rules] - !reference [.rusticl-rules, rules]
.v3d-rusticl-manual-rules: .v3d-rusticl-manual-rules:
stage: broadcom stage: broadcom-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.v3d-manual-rules, rules] - !reference [.v3d-manual-rules, rules]
@ -105,7 +105,7 @@
when: on_success when: on_success
.v3dv-manual-rules: .v3dv-manual-rules:
stage: broadcom stage: broadcom-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]

14
src/freedreno/ci/gitlab-ci-inc.yml
View file

@ -55,7 +55,7 @@
when: on_success when: on_success
.google-freedreno-manual-rules: .google-freedreno-manual-rules:
stage: freedreno stage: freedreno-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
@ -67,7 +67,7 @@
when: manual when: manual
.collabora-freedreno-manual-rules: .collabora-freedreno-manual-rules:
stage: freedreno stage: freedreno-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
@ -101,7 +101,7 @@
when: on_success when: on_success
.google-turnip-manual-rules: .google-turnip-manual-rules:
stage: freedreno stage: freedreno-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
@ -113,7 +113,7 @@
when: manual when: manual
.collabora-turnip-manual-rules: .collabora-turnip-manual-rules:
stage: freedreno stage: freedreno-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
@ -133,7 +133,7 @@
- !reference [.google-turnip-rules, rules] - !reference [.google-turnip-rules, rules]
.google-freedreno-turnip-manual-rules: .google-freedreno-turnip-manual-rules:
stage: freedreno stage: freedreno-postmerge
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.google-freedreno-manual-rules, rules] - !reference [.google-freedreno-manual-rules, rules]
@ -147,14 +147,14 @@
- !reference [.collabora-turnip-rules, rules] - !reference [.collabora-turnip-rules, rules]
.collabora-freedreno-turnip-manual-rules: .collabora-freedreno-turnip-manual-rules:
stage: freedreno stage: freedreno-postmerge
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]
- !reference [.collabora-freedreno-manual-rules, rules] - !reference [.collabora-freedreno-manual-rules, rules]
- !reference [.collabora-turnip-manual-rules, rules] - !reference [.collabora-turnip-manual-rules, rules]
.valve-freedreno-turnip-manual-rules: .valve-freedreno-turnip-manual-rules:
stage: freedreno stage: freedreno-postmerge
extends: .no-auto-retry extends: .no-auto-retry
rules: rules:
- !reference [.test, rules] - !reference [.test, rules]