Skip to content

Commit 10646dd

Browse files
vigneshramanhelen-fornazier
authored andcommitted
drm/ci: fix merge request rules
Merge request pipelines were only created when changes were made to drivers/gpu/drm/ci/, causing MRs that didn't touch this path to break. Fix MR pipeline rules to trigger jobs for all changes. Run jobs automatically for marge-bot and scheduled pipelines, but in all other cases run manually. Also remove CI_PROJECT_NAMESPACE checks specific to mesa. Fixes: df54f04 ("drm/ci: update gitlab rules") Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com> Reviewed-by: Daniel Stone <daniels@collabora.com> Signed-off-by: Helen Koike <helen.fornazier@gmail.com> Link: https://patchwork.freedesktop.org/patch/msgid/20250228132620.556079-1-vignesh.raman@collabora.com
1 parent f9f087d commit 10646dd

File tree

1 file changed

+4
-15
lines changed

1 file changed

+4
-15
lines changed

drivers/gpu/drm/ci/gitlab-ci.yml

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ stages:
143143
# Pre-merge pipeline
144144
- if: &is-pre-merge $CI_PIPELINE_SOURCE == "merge_request_event"
145145
# Push to a branch on a fork
146-
- if: &is-fork-push $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push"
146+
- if: &is-fork-push $CI_PIPELINE_SOURCE == "push"
147147
# nightly pipeline
148148
- if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
149149
# pipeline for direct pushes that bypassed the CI
150-
- if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
150+
- if: &is-direct-push $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
151151

152152

153153
# Rules applied to every job in the pipeline
@@ -170,26 +170,15 @@ stages:
170170
- !reference [.disable-farm-mr-rules, rules]
171171
# Never run immediately after merging, as we just ran everything
172172
- !reference [.never-post-merge-rules, rules]
173-
# Build everything in merge pipelines, if any files affecting the pipeline
174-
# were changed
173+
# Build everything in merge pipelines
175174
- if: *is-merge-attempt
176-
changes: &all_paths
177-
- drivers/gpu/drm/ci/**/*
178175
when: on_success
179176
# Same as above, but for pre-merge pipelines
180177
- if: *is-pre-merge
181-
changes:
182-
*all_paths
183178
when: manual
184-
# Skip everything for pre-merge and merge pipelines which don't change
185-
# anything in the build
186-
- if: *is-merge-attempt
187-
when: never
188-
- if: *is-pre-merge
189-
when: never
190179
# Build everything after someone bypassed the CI
191180
- if: *is-direct-push
192-
when: on_success
181+
when: manual
193182
# Build everything in scheduled pipelines
194183
- if: *is-scheduled-pipeline
195184
when: on_success

0 commit comments

Comments
 (0)