* [PATCH v3] drm/ci: fix merge request rules
@ 2025-02-28 13:26 Vignesh Raman
2025-03-10 8:25 ` Daniel Stone
0 siblings, 1 reply; 3+ messages in thread
From: Vignesh Raman @ 2025-02-28 13:26 UTC (permalink / raw)
To: dri-devel
Cc: daniels, helen.fornazier, airlied, simona.vetter, robdclark,
dmitry.baryshkov, guilherme.gallo, sergi.blanch.torne,
valentine.burley, linux-kernel
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: df54f04f2020 ("drm/ci: update gitlab rules")
Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
---
v2:
- 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.
v3:
- Fix yaml syntax
---
drivers/gpu/drm/ci/gitlab-ci.yml | 19 ++++---------------
1 file changed, 4 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/ci/gitlab-ci.yml b/drivers/gpu/drm/ci/gitlab-ci.yml
index f04aabe8327c..b06b9e7d3d09 100644
--- a/drivers/gpu/drm/ci/gitlab-ci.yml
+++ b/drivers/gpu/drm/ci/gitlab-ci.yml
@@ -143,11 +143,11 @@ stages:
# Pre-merge pipeline
- if: &is-pre-merge $CI_PIPELINE_SOURCE == "merge_request_event"
# Push to a branch on a fork
- - if: &is-fork-push $CI_PROJECT_NAMESPACE != "mesa" && $CI_PIPELINE_SOURCE == "push"
+ - if: &is-fork-push $CI_PIPELINE_SOURCE == "push"
# nightly pipeline
- if: &is-scheduled-pipeline $CI_PIPELINE_SOURCE == "schedule"
# pipeline for direct pushes that bypassed the CI
- - if: &is-direct-push $CI_PROJECT_NAMESPACE == "mesa" && $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
+ - if: &is-direct-push $CI_PIPELINE_SOURCE == "push" && $GITLAB_USER_LOGIN != "marge-bot"
# Rules applied to every job in the pipeline
@@ -170,26 +170,15 @@ stages:
- !reference [.disable-farm-mr-rules, rules]
# Never run immediately after merging, as we just ran everything
- !reference [.never-post-merge-rules, rules]
- # Build everything in merge pipelines, if any files affecting the pipeline
- # were changed
+ # Build everything in merge pipelines
- if: *is-merge-attempt
- changes: &all_paths
- - drivers/gpu/drm/ci/**/*
when: on_success
# Same as above, but for pre-merge pipelines
- if: *is-pre-merge
- changes:
- *all_paths
when: manual
- # Skip everything for pre-merge and merge pipelines which don't change
- # anything in the build
- - if: *is-merge-attempt
- when: never
- - if: *is-pre-merge
- when: never
# Build everything after someone bypassed the CI
- if: *is-direct-push
- when: on_success
+ when: manual
# Build everything in scheduled pipelines
- if: *is-scheduled-pipeline
when: on_success
--
2.47.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] drm/ci: fix merge request rules
2025-02-28 13:26 [PATCH v3] drm/ci: fix merge request rules Vignesh Raman
@ 2025-03-10 8:25 ` Daniel Stone
2025-03-12 17:35 ` Helen Mae Koike Fornazier
0 siblings, 1 reply; 3+ messages in thread
From: Daniel Stone @ 2025-03-10 8:25 UTC (permalink / raw)
To: Vignesh Raman
Cc: dri-devel, daniels, helen.fornazier, airlied, simona.vetter,
robdclark, dmitry.baryshkov, guilherme.gallo, sergi.blanch.torne,
valentine.burley, linux-kernel
On Fri, 28 Feb 2025 at 13:26, Vignesh Raman <vignesh.raman@collabora.com> wrote:
> 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.
Thanks Vignesh, this is:
Reviewed-by: Daniel Stone <daniels@collabora.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] drm/ci: fix merge request rules
2025-03-10 8:25 ` Daniel Stone
@ 2025-03-12 17:35 ` Helen Mae Koike Fornazier
0 siblings, 0 replies; 3+ messages in thread
From: Helen Mae Koike Fornazier @ 2025-03-12 17:35 UTC (permalink / raw)
To: Daniel Stone
Cc: Vignesh Raman, dri-devel, daniels, airlied, simona.vetter,
robdclark, dmitry.baryshkov, guilherme.gallo, sergi.blanch.torne,
valentine.burley, linux-kernel
Em seg., 10 de mar. de 2025 às 05:25, Daniel Stone
<daniel@fooishbar.org> escreveu:
>
> On Fri, 28 Feb 2025 at 13:26, Vignesh Raman <vignesh.raman@collabora.com> wrote:
> > 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.
>
> Thanks Vignesh, this is:
> Reviewed-by: Daniel Stone <daniels@collabora.com>
Applied to drm-misc-next.
Thanks!
--
Helen Koike
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-12 17:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-28 13:26 [PATCH v3] drm/ci: fix merge request rules Vignesh Raman
2025-03-10 8:25 ` Daniel Stone
2025-03-12 17:35 ` Helen Mae Koike Fornazier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®